JAVA-2065: Use same DBPort instance for bulk write requests that use OP_INSERT/UPDATE/DELETE wire protocol messages, whether because the write concern is unacknowledged or because the server version is <= 2.4.

Author: jyemin

src/main/com/mongodb/DBCollectionImpl.java

@@ -904,8 +904,8 @@ BulkWriteResult executeWriteCommandProtocol() {
                 @Override
                 WriteResult executeWriteProtocol(final int i) {
                     ModifyRequest update = updateRequests.get(i);
-                    WriteResult writeResult = update(update.getQuery(), update.getUpdateDocument(), update.isUpsert(),
-                            update.isMulti(), writeConcern, encoder);
+                    WriteResult writeResult = db.getConnector().say(_db, OutMessage.update(DBCollectionImpl.this, encoder,
+                            update.isUpsert(), update.isMulti(), update.getQuery(), update.getUpdateDocument()), writeConcern, port);
                     return addMissingUpserted(update, writeResult);
                 }
 
@@ -930,8 +930,8 @@ BulkWriteResult executeWriteCommandProtocol() {
                 @Override
                 WriteResult executeWriteProtocol(final int i) {
                     ModifyRequest update = replaceRequests.get(i);
-                    WriteResult writeResult = update(update.getQuery(), update.getUpdateDocument(), update.isUpsert(),
-                            update.isMulti(), writeConcern, encoder);
+                    WriteResult writeResult = db.getConnector().say(_db, OutMessage.update(DBCollectionImpl.this, encoder,
+                            update.isUpsert(), update.isMulti(), update.getQuery(), update.getUpdateDocument()), writeConcern, port);
                     return addMissingUpserted(update, writeResult);
                 }
 
@@ -952,7 +952,8 @@ BulkWriteResult executeWriteCommandProtocol() {
                 @Override
                 WriteResult executeWriteProtocol(final int i) {
                     RemoveRequest removeRequest = removeRequests.get(i);
-                    return remove(removeRequest.getQuery(), removeRequest.isMulti(), writeConcern, encoder);
+                    return db.getConnector().say(_db, OutMessage.remove(DBCollectionImpl.this, encoder, removeRequest.getQuery(),
+                            removeRequest.isMulti()), writeConcern, port);
                 }
 
                 @Override
@@ -975,7 +976,7 @@ BulkWriteResult executeWriteCommandProtocol() {
 
                 @Override
                 WriteResult executeWriteProtocol(final int i) {
-                    return insert(asList(insertRequests.get(i).getDocument()), writeConcern, encoder);
+                    return insertWithWriteProtocol(asList(insertRequests.get(i).getDocument()), writeConcern, encoder, port, true);
                 }
 
                 @Override