Make the cursor status transition consistent.

cloudcao2 · Sep 16, 2018 · b21ad1e · b21ad1e
1 parent d14c67e
commit b21ad1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java b/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java
@@ -139,12 +139,11 @@ protected T fetchNextObjectFromDatabase() {
       return null;
     }
 
-    final boolean resultSetClosed;
     try {
       status = CursorStatus.OPEN;
-      resultSetHandler.handleRowValues(rsw, resultMap, objectWrapperResultHandler, RowBounds.DEFAULT, null);
-      // ResultSet might have been closed by the driver (e.g. DB2).
-      resultSetClosed = rsw.getResultSet().isClosed();
+      if (!rsw.getResultSet().isClosed()) {
+        resultSetHandler.handleRowValues(rsw, resultMap, objectWrapperResultHandler, RowBounds.DEFAULT, null);
+      }
     } catch (SQLException e) {
       throw new RuntimeException(e);
     }
@@ -154,7 +153,7 @@ protected T fetchNextObjectFromDatabase() {
       indexWithRowBound++;
     }
     // No more object or limit reached
-    if (resultSetClosed || next == null || getReadItemsCount() == rowBounds.getOffset() + rowBounds.getLimit()) {
+    if (next == null || getReadItemsCount() == rowBounds.getOffset() + rowBounds.getLimit()) {
       close();
       status = CursorStatus.CONSUMED;
     }

diff --git a/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java b/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java
@@ -100,9 +100,13 @@ public void shouldCloseImmediatelyIfResultSetIsClosed() throws Exception {
       Map<String, Object> map = (Map<String, Object>) iter.next();
       assertEquals(Integer.valueOf(1), map.get("id"));
       assertEquals("CEO", ((Map<String, Object>) map.get("roles")).get("role"));
+
+      assertFalse(cursor.isConsumed());
+      assertTrue(cursor.isOpen());
+
+      assertFalse(iter.hasNext());
       assertTrue(cursor.isConsumed());
       assertFalse(cursor.isOpen());
-      assertFalse(iter.hasNext());
     }
   }
 

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
@@ -77,6 +77,9 @@ public void shouldGetAllUser() {
       Assert.assertEquals(2, user.getGroups().size());
       Assert.assertEquals(2, user.getRoles().size());
 
+      Assert.assertTrue(usersCursor.isOpen());
+      Assert.assertFalse(usersCursor.isConsumed());
+
       // Check no more elements
       Assert.assertFalse(iterator.hasNext());
       Assert.assertFalse(usersCursor.isOpen());