refact: update if... else...

Dreamroute · Dreamroute · commit fa8d9a033fbf · 2019-09-24T18:22:05.000+08:00
diff --git a/src/main/java/org/apache/ibatis/executor/statement/StatementUtil.java b/src/main/java/org/apache/ibatis/executor/statement/StatementUtil.java
@@ -45,9 +45,7 @@ public static void applyTransactionTimeout(Statement statement, Integer queryTim
       return;
     }
     Integer timeToLiveOfQuery = null;
-    if (queryTimeout == null || queryTimeout == 0) {
-      timeToLiveOfQuery = transactionTimeout;
-    } else if (transactionTimeout < queryTimeout) {
+    if (queryTimeout == null || queryTimeout == 0 || transactionTimeout < queryTimeout) {
       timeToLiveOfQuery = transactionTimeout;
     }
     if (timeToLiveOfQuery != null) {

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ public static void applyTransactionTimeout(Statement statement, Integer queryTim`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`	`Integer timeToLiveOfQuery = null;`
`48`		`- if (queryTimeout == null \|\| queryTimeout == 0) {`
`49`		`- timeToLiveOfQuery = transactionTimeout;`
`50`		`- } else if (transactionTimeout < queryTimeout) {`
	`48`	`+ if (queryTimeout == null \|\| queryTimeout == 0 \|\| transactionTimeout < queryTimeout) {`
`51`	`49`	`timeToLiveOfQuery = transactionTimeout;`
`52`	`50`	`}`
`53`	`51`	`if (timeToLiveOfQuery != null) {`