JAVA-2831: Don't send batch size of 0 for listCollections or listIndexes

jyemin · jyemin · commit 80556b3a2132 · 2018-04-17T17:23:04.000-04:00
diff --git a/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java b/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java
@@ -270,7 +270,7 @@ private MongoNamespace getNamespace() {
 
     private BsonDocument getCommand() {
         BsonDocument command = new BsonDocument("listCollections", new BsonInt32(1))
-                .append("cursor", getCursorDocumentFromBatchSize(batchSize));
+                .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
         if (filter != null) {
             command.append("filter", filter);
         }
diff --git a/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java b/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java
@@ -226,7 +226,7 @@ private MongoNamespace getIndexNamespace() {
 
     private BsonDocument getCommand() {
         BsonDocument command = new BsonDocument("listIndexes", new BsonString(namespace.getCollectionName()))
-                .append("cursor", getCursorDocumentFromBatchSize(batchSize));
+                .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
         if (maxTimeMS > 0) {
             command.put("maxTimeMS", new BsonInt64(maxTimeMS));
         }

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private MongoNamespace getNamespace() {`
`270`	`270`
`271`	`271`	`private BsonDocument getCommand() {`
`272`	`272`	`BsonDocument command = new BsonDocument("listCollections", new BsonInt32(1))`
`273`		`- .append("cursor", getCursorDocumentFromBatchSize(batchSize));`
	`273`	`+ .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));`
`274`	`274`	`if (filter != null) {`
`275`	`275`	`command.append("filter", filter);`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private MongoNamespace getIndexNamespace() {`
`226`	`226`
`227`	`227`	`private BsonDocument getCommand() {`
`228`	`228`	`BsonDocument command = new BsonDocument("listIndexes", new BsonString(namespace.getCollectionName()))`
`229`		`- .append("cursor", getCursorDocumentFromBatchSize(batchSize));`
	`229`	`+ .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));`
`230`	`230`	`if (maxTimeMS > 0) {`
`231`	`231`	`command.put("maxTimeMS", new BsonInt64(maxTimeMS));`
`232`	`232`	`}`