Polishing handling of timeout and defaultStatementTimeout #503

kazuki43zoo · kazuki43zoo · commit 2b929b508239 · 2015-10-25T17:22:19.000+09:00
diff --git a/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java b/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
@@ -102,10 +102,12 @@ public Statement prepare(Connection connection) throws SQLException {
 
   protected void setStatementTimeout(Statement stmt) throws SQLException {
     Integer timeout = mappedStatement.getTimeout();
-    Integer defaultTimeout = configuration.getDefaultStatementTimeout();
     if (timeout != null) {
       stmt.setQueryTimeout(timeout);
-    } else if (defaultTimeout != null) {
+      return;
+    }
+    Integer defaultTimeout = configuration.getDefaultStatementTimeout();
+    if (defaultTimeout != null) {
       stmt.setQueryTimeout(defaultTimeout);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,12 @@ public Statement prepare(Connection connection) throws SQLException {`
`102`	`102`
`103`	`103`	`protected void setStatementTimeout(Statement stmt) throws SQLException {`
`104`	`104`	`Integer timeout = mappedStatement.getTimeout();`
`105`		`- Integer defaultTimeout = configuration.getDefaultStatementTimeout();`
`106`	`105`	`if (timeout != null) {`
`107`	`106`	`stmt.setQueryTimeout(timeout);`
`108`		`- } else if (defaultTimeout != null) {`
	`107`	`+ return;`
	`108`	`+ }`
	`109`	`+ Integer defaultTimeout = configuration.getDefaultStatementTimeout();`
	`110`	`+ if (defaultTimeout != null) {`
`109`	`111`	`stmt.setQueryTimeout(defaultTimeout);`
`110`	`112`	`}`
`111`	`113`	`}`