fix batchSize

mongodb · Jul 29, 2010 · babe893 · babe893
1 parent 02a8ce1
commit babe893
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/client/dbclientcursor.cpp b/client/dbclientcursor.cpp
@@ -28,14 +28,10 @@ namespace mongo {
 
     int DBClientCursor::nextBatchSize(){
 
-        if ( nToReturn == 0 ){
-            if ( batchSize > 1 )
-                return batchSize;
-            else
-                return 0;
-        }
+        if ( nToReturn == 0 )
+            return batchSize;
 
-        if ( batchSize <= 1 )
+        if ( batchSize == 0 )
             return nToReturn;
 
         return batchSize < nToReturn ? batchSize : nToReturn;

diff --git a/client/dbclientcursor.h b/client/dbclientcursor.h
@@ -117,7 +117,7 @@ namespace mongo {
                 nToSkip(_nToSkip),
                 fieldsToReturn(_fieldsToReturn),
                 opts(queryOptions),
-                batchSize(bs),
+                batchSize(bs==1?2:bs),
                 m(new Message()),
                 cursorId(),
                 nReturned(),