Merge pull request #1675 from Dreamroute/master

Remove unnecessary code.

Author: harawata

src/main/java/org/apache/ibatis/executor/statement/StatementUtil.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -41,17 +41,11 @@ private StatementUtil() {
    * @throws SQLException if a database access error occurs, this method is called on a closed <code>Statement</code>
    */
   public static void applyTransactionTimeout(Statement statement, Integer queryTimeout, Integer transactionTimeout) throws SQLException {
-    if (transactionTimeout == null){
+    if (transactionTimeout == null) {
       return;
     }
-    Integer timeToLiveOfQuery = null;
-    if (queryTimeout == null || queryTimeout == 0) {
-      timeToLiveOfQuery = transactionTimeout;
-    } else if (transactionTimeout < queryTimeout) {
-      timeToLiveOfQuery = transactionTimeout;
-    }
-    if (timeToLiveOfQuery != null) {
-      statement.setQueryTimeout(timeToLiveOfQuery);
+    if (queryTimeout == null || queryTimeout == 0 || transactionTimeout < queryTimeout) {
+      statement.setQueryTimeout(transactionTimeout);
     }
   }