Merge pull request #2874 from harawata/undo-invalid-code-optimization

Undo invalid code optimization

Author: harawata

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -259,14 +259,18 @@ private ResultSetWrapper getFirstResultSet(Statement stmt) throws SQLException {
   private ResultSetWrapper getNextResultSet(Statement stmt) {
     // Making this method tolerant of bad JDBC drivers
     try {
-      // Crazy Standard JDBC way of determining if there are more results
-      if (stmt.getConnection().getMetaData().supportsMultipleResultSets()
-          && (stmt.getMoreResults() || (stmt.getUpdateCount() != -1))) {
-        ResultSet rs = stmt.getResultSet();
-        if (rs == null) {
-          return getNextResultSet(stmt);
+      if (stmt.getConnection().getMetaData().supportsMultipleResultSets()) {
+        // Crazy Standard JDBC way of determining if there are more results
+        // DO NOT try to 'imporove' the condition even if IDE tells you to!
+        // It's important that getUpdateCount() is called here.
+        if (!(!stmt.getMoreResults() && stmt.getUpdateCount() == -1)) {
+          ResultSet rs = stmt.getResultSet();
+          if (rs == null) {
+            return getNextResultSet(stmt);
+          } else {
+            return new ResultSetWrapper(rs, configuration);
+          }
         }
-        return new ResultSetWrapper(rs, configuration);
       }
     } catch (Exception e) {
       // Intentionally ignored.

src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java

@@ -248,7 +248,9 @@ private void executeStatement(String command) throws SQLException {
       }
       try {
         boolean hasResults = statement.execute(sql);
-        while ((hasResults || (statement.getUpdateCount() != -1))) {
+        // DO NOT try to 'imporove' the condition even if IDE tells you to!
+        // It's important that getUpdateCount() is called here.
+        while (!(!hasResults && statement.getUpdateCount() == -1)) {
           checkWarnings(statement);
           printResults(statement, hasResults);
           hasResults = statement.getMoreResults();