Merge pull request #1298 from kazuki43zoo/gh-1297

Add closed check at Cursor.iterator

Author: kazuki43zoo

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;
     }

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());
+        }
+
+    }
+
 }