Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 4 insertions, 14 deletions

diff --git a/src/mongo/scripting/mozjs/mongo.cpp b/src/mongo/scripting/mozjs/mongo.cpp
index 3e2a1e9b05a..00818afb115 100644
--- a/src/mongo/scripting/mozjs/mongo.cpp
+++ b/src/mongo/scripting/mozjs/mongo.cpp
@@ -86,7 +86,6 @@ const JSFunctionSpec MongoBase::methods[] = {
 const char* const MongoBase::className = "Mongo";
 
 EncryptedDBClientCallback* encryptedDBClientCallback = nullptr;
-GetNestedConnectionCallback* getNestedConnectionCallback = nullptr;
 
 const JSFunctionSpec MongoExternalInfo::freeFunctions[4] = {
     MONGO_ATTACH_JS_FUNCTION(_forgetReplSet),
@@ -488,16 +487,9 @@ void MongoBase::Functions::_markNodeAsFailed::call(JSContext* cx, JS::CallArgs a
                   "third argument to _markNodeAsFailed must be a stringified reason");
     }
 
-    DBClientReplicaSet* rsConn = dynamic_cast<DBClientReplicaSet*>(getConnection(args));
-    if (!rsConn && getNestedConnectionCallback) {
-        DBClientBase* base = getNestedConnectionCallback(getConnection(args));
-        if (base) {
-            rsConn = dynamic_cast<DBClientReplicaSet*>(base);
-        }
-    }
-
+    auto* rsConn = dynamic_cast<DBClientReplicaSet*>(getConnection(args));
     if (!rsConn) {
-        uasserted(ErrorCodes::BadValue, "connection object is not a replica set object");
+        uasserted(ErrorCodes::BadValue, "connection object isn't a replica set connection");
     }
 
     auto hostAndPort = ValueWriter(cx, args.get(0)).toString();
@@ -522,10 +514,8 @@ std::unique_ptr<DBClientBase> runEncryptedDBClientCallback(std::unique_ptr<DBCli
     return conn;
 }
 
-void setEncryptedDBClientCallbacks(EncryptedDBClientCallback* encCallback,
-                                   GetNestedConnectionCallback* getCallback) {
-    encryptedDBClientCallback = encCallback;
-    getNestedConnectionCallback = getCallback;
+void setEncryptedDBClientCallback(EncryptedDBClientCallback* callback) {
+    encryptedDBClientCallback = callback;
 }
 
 // "new Mongo(uri, encryptedDBClientCallback, {options...})"