SERVER-11686 write_cmd_auto_split.js failure on debug builds

2 files changed, 14 insertions, 6 deletions

diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index e7c3fe3928d..b6c362da86d 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -470,8 +470,8 @@ namespace mongo {
 
         BSONObj queryObj = updateOp.getQuery();
         BSONObj updateObj = updateOp.getUpdateExpr();
-        bool multi = updateOp.isMultiSet() ? updateOp.getMulti() : false;
-        bool upsert = updateOp.isUpsertSet() ? updateOp.getUpsert() : false;
+        bool multi = updateOp.getMulti();
+        bool upsert = updateOp.getUpsert();
 
         currentOp->setQuery( queryObj );
         opDebug.op = dbUpdate;
diff --git a/src/mongo/s/write_ops/batched_update_document.cpp b/src/mongo/s/write_ops/batched_update_document.cpp
index d6834e5cd31..33738065ed2 100644
--- a/src/mongo/s/write_ops/batched_update_document.cpp
+++ b/src/mongo/s/write_ops/batched_update_document.cpp
@@ -180,8 +180,12 @@ namespace mongo {
     }
 
     bool BatchedUpdateDocument::getMulti() const {
-        dassert(_isMultiSet);
-        return _multi;
+        if (_isMultiSet) {
+            return _multi;
+        }
+        else {
+            return multi.getDefault();
+        }
     }
 
     void BatchedUpdateDocument::setUpsert(bool upsert) {
@@ -198,8 +202,12 @@ namespace mongo {
     }
 
     bool BatchedUpdateDocument::getUpsert() const {
-        dassert(_isUpsertSet);
-        return _upsert;
+        if (_isUpsertSet) {
+            return _upsert;
+        }
+        else {
+            return upsert.getDefault();
+        }
     }
 
 } // namespace mongo