Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 11 insertions, 22 deletions

diff --git a/src/mongo/db/update/storage_validation.cpp b/src/mongo/db/update/storage_validation.cpp
index 69967c14aef..d94c645a588 100644
--- a/src/mongo/db/update/storage_validation.cpp
+++ b/src/mongo/db/update/storage_validation.cpp
@@ -160,30 +160,19 @@ void scanDocument(const mutablebson::Document& doc,
     auto currElem = doc.root().leftChild();
     while (currElem.ok()) {
         if (currElem.getFieldName() == idFieldName && shouldValidate) {
-            if (currElem.getType() == BSONType::Object) {
-                // We need to recursively validate the _id field while ensuring we disallow
-                // top-level $-prefix fields in the _id object.
-                scanDocument(currElem,
-                             true /* deep */,
-                             0 /* recursionLevel - forces _id fields to be treated as top-level. */,
-                             false /* Top-level _id fields cannot be $-prefixed. */,
-                             shouldValidate,
-                             containsDotsAndDollarsField);
-            } else {
-                uassertStatusOK(storageValidIdField(currElem.getValue()));
-            }
-        } else {
-            // Validate this child element.
-            const auto deep = true;
-            const uint32_t recursionLevel = 1;
-            scanDocument(currElem,
-                         deep,
-                         recursionLevel,
-                         allowTopLevelDollarPrefixes,
-                         shouldValidate,
-                         containsDotsAndDollarsField);
+            uassertStatusOK(storageValidIdField(currElem.getValue()));
         }
 
+        // Validate this child element.
+        const auto deep = true;
+        const uint32_t recursionLevel = 1;
+        scanDocument(currElem,
+                     deep,
+                     recursionLevel,
+                     allowTopLevelDollarPrefixes,
+                     shouldValidate,
+                     containsDotsAndDollarsField);
+
         currElem = currElem.rightSibling();
     }
 }