SERVER-16657 ClientCursor namespace set explicitly on construction

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp
index b6b73e12454..c3d6575ae2d 100644
--- a/src/mongo/db/query/find.cpp
+++ b/src/mongo/db/query/find.cpp
@@ -842,7 +842,9 @@ namespace mongo {
 
             // Allocate a new ClientCursor.  We don't have to worry about leaking it as it's
             // inserted into a global map by its ctor.
-            ClientCursor* cc = new ClientCursor(collection->cursorManager(), exec.get(),
+            ClientCursor* cc = new ClientCursor(collection->cursorManager(),
+                                                exec.release(),
+                                                nss.ns(),
                                                 pq.getOptions().toInt(),
                                                 pq.getFilter());
             ccId = cc->cursorid();
@@ -865,9 +867,6 @@ namespace mongo {
             QLOG() << "caching executor with cursorid " << ccId
                    << " after returning " << numResults << " results" << endl;
 
-            // ClientCursor takes ownership of executor.  Release to make sure it's not deleted.
-            exec.release();
-
             // TODO document
             if (pq.getOptions().oplogReplay && !slaveReadTill.isNull()) {
                 cc->slaveReadTill(slaveReadTill);