JAVA-1165 ensure array and itcount methods always close cursor server side even on IO error

Author: john-morales

src/main/com/mongodb/DBCursor.java

@@ -602,8 +602,12 @@ public void remove(){
 
     void _fill( int n ){
         _checkType( CursorType.ARRAY );
-        while ( n >= _all.size() && _hasNext() )
-            _next();
+        try {
+            while ( n >= _all.size() && _hasNext() )
+                _next();
+        } finally {
+            this.close();
+        }
     }
 
     /**
@@ -649,12 +653,16 @@ public List<DBObject> toArray( int max ) {
      * @throws MongoException
      */
     public int itcount(){
-        int n = 0;
-        while ( this.hasNext() ){
-            this.next();
-            n++;
+        try {
+            int n = 0;
+            while ( this.hasNext() ){
+                this.next();
+                n++;
+            }
+            return n;
+        } finally {
+            this.close();
         }
-        return n;
     }
 
     /**

src/test/com/mongodb/DBCursorTest.java

@@ -674,6 +674,20 @@ public void testShowDiskLoc() {
         }
     }
 
+    @Test
+    public void testToArrayCursorClosed() {
+        final DBCollection c = collection;
+
+        // Insert some data.
+        for (int i = 0; i < 4; i++) {
+            c.insert(new BasicDBObject("one", "two"));
+        }
+
+        final DBCursor cursor = c.find().batchSize(3); // ensure under normal conditions the cursor would remain
+        cursor.toArray(3);
+        assertEquals(0L, cursor.getCursorId());
+    }
+
     @Test(expected = MongoException.class)
     public void testSnapshotWithHint() {
         DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())