Merge pull request mybatis#1298 from kazuki43zoo/mybatisgh-1297

Add closed check at Cursor.iterator
pulllock · Sep 1, 2018 · 7a6921c · 7a6921c
2 parents aba8cc5 + e9849bb
commit 7a6921c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 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
@@ -97,6 +97,9 @@ public Iterator<T> iterator() {
         if (iteratorRetrieved) {
             throw new IllegalStateException("Cannot open more than one iterator on a Cursor");
         }
+        if (isClosed()) {
+            throw new IllegalStateException("A Cursor is already closed.");
+        }
         iteratorRetrieved = true;
         return cursorIterator;
     }

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
@@ -361,4 +361,31 @@ public void shouldGetAllUserUsingAnnotationBasedMapper() {
         }
     }
 
+    @Test
+    public void shouldThrowIllegalStateExceptionUsingIteratorOnSessionClosed() {
+        Cursor<User> usersCursor;
+        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+            usersCursor = sqlSession.getMapper(Mapper.class).getAllUsers();
+        }
+        try {
+            usersCursor.iterator();
+            Assert.fail("Should throws the IllegalStateException when call the iterator method after session is closed.");
+        } catch (IllegalStateException e) {
+            Assert.assertEquals("A Cursor is already closed.", e.getMessage());
+        }
+
+        // verify for checking order
+        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+            usersCursor = sqlSession.getMapper(Mapper.class).getAllUsers();
+            usersCursor.iterator();
+        }
+        try {
+            usersCursor.iterator();
+            Assert.fail("Should throws the IllegalStateException when call the iterator already.");
+        } catch (IllegalStateException e) {
+            Assert.assertEquals("Cannot open more than one iterator on a Cursor", e.getMessage());
+        }
+
+    }
+
 }