fix(bulkWrite): fix issue with bulkWrite continuing w/ callback

mongodb · Apr 1, 2019 · 2a4a42c · 2a4a42c
1 parent b86ee69
commit 2a4a42c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/lib/bulk/common.js b/lib/bulk/common.js
@@ -906,6 +906,15 @@ class BulkOperationBase {
     );
   }
 
+  _handleEarlyError(err, callback) {
+    if (typeof callback === 'function') {
+      callback(err, null);
+      return;
+    }
+
+    return this.s.promiseLibrary.reject(err);
+  }
+
   /**
    * Execute next write command in a chain
    *
@@ -919,19 +928,17 @@ class BulkOperationBase {
     if (typeof options === 'function') (callback = options), (options = {});
     options = options || {};
 
-    if (this.s.executed) {
-      const executedError = toError('batch cannot be re-executed');
-      return typeof callback === 'function'
-        ? callback(executedError, null)
-        : this.s.promiseLibrary.reject(executedError);
-    }
-
     if (typeof _writeConcern === 'function') {
       callback = _writeConcern;
     } else if (_writeConcern && typeof _writeConcern === 'object') {
       this.s.writeConcern = _writeConcern;
     }
 
+    if (this.s.executed) {
+      const executedError = toError('batch cannot be re-executed');
+      return this._handleEarlyError(executedError, callback);
+    }
+
     // If we have current batch
     if (this.isOrdered) {
       if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch);
@@ -943,9 +950,7 @@ class BulkOperationBase {
     // If we have no operations in the bulk raise an error
     if (this.s.batches.length === 0) {
       const emptyBatchError = toError('Invalid Operation, no operations specified');
-      return typeof callback === 'function'
-        ? callback(emptyBatchError, null)
-        : this.s.promiseLibrary.reject(emptyBatchError);
+      return this._handleEarlyError(emptyBatchError, callback);
     }
     return { options, callback };
   }

diff --git a/lib/bulk/ordered.js b/lib/bulk/ordered.js
@@ -119,7 +119,7 @@ class OrderedBulkOperation extends BulkOperationBase {
    */
   execute(_writeConcern, options, callback) {
     const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
+    if (!ret || isPromiseLike(ret)) {
       return ret;
     }
 

diff --git a/lib/bulk/unordered.js b/lib/bulk/unordered.js
@@ -131,7 +131,7 @@ class UnorderedBulkOperation extends BulkOperationBase {
    */
   execute(_writeConcern, options, callback) {
     const ret = this.bulkExecute(_writeConcern, options, callback);
-    if (isPromiseLike(ret)) {
+    if (!ret || isPromiseLike(ret)) {
       return ret;
     }