do not create extra NamespaceString

3 files changed, 3 insertions, 2 deletions

diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 9c38572e51a..c23c20c2eb3 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -209,7 +209,7 @@ namespace mongo {
                 audit::logQueryAuthzCheck(client, ns, q.query, status.code());
                 uassertStatusOK(status);
             }
-            dbresponse.exhaustNS = runQuery(txn, m, q, op, *resp, fromDBDirectClient);
+            dbresponse.exhaustNS = runQuery(txn, m, q, ns, op, *resp, fromDBDirectClient);
             verify( !resp->empty() );
         }
         catch ( SendStaleConfigException& e ){
diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp
index cf9f7ec4af7..b6b73e12454 100644
--- a/src/mongo/db/query/find.cpp
+++ b/src/mongo/db/query/find.cpp
@@ -540,11 +540,11 @@ namespace mongo {
     std::string runQuery(OperationContext* txn,
                          Message& m,
                          QueryMessage& q,
+                         const NamespaceString& nss,
                          CurOp& curop,
                          Message &result,
                          bool fromDBDirectClient) {
         // Validate the namespace.
-        const NamespaceString nss(q.ns);
         uassert(16256, str::stream() << "Invalid ns [" << nss.ns() << "]", nss.isValid());
 
         // Set curop information.
diff --git a/src/mongo/db/query/find.h b/src/mongo/db/query/find.h
index dc3a2525c48..0b5d8024756 100644
--- a/src/mongo/db/query/find.h
+++ b/src/mongo/db/query/find.h
@@ -74,6 +74,7 @@ namespace mongo {
     std::string runQuery(OperationContext* txn,
                          Message& m,
                          QueryMessage& q,
+                         const NamespaceString& ns,
                          CurOp& curop,
                          Message &result,
                          bool fromDBDirectClient);