1 files changed, 15 insertions, 10 deletions

diff --git a/src/mongo/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp
index fd713ae161a..f008ab9938d 100644
--- a/src/mongo/dbtests/repltests.cpp
+++ b/src/mongo/dbtests/repltests.cpp
@@ -139,9 +139,9 @@ public:
         dbtests::WriteContextForTests ctx(&_opCtx, ns());
         WriteUnitOfWork wuow(&_opCtx);
 
-        Collection* c = ctx.db()->getCollection(&_opCtx, ns());
+        Collection* c = ctx.db()->getCollection(&_opCtx, nss());
         if (!c) {
-            c = ctx.db()->createCollection(&_opCtx, ns());
+            c = ctx.db()->createCollection(&_opCtx, nss());
         }
 
         ASSERT(c->getIndexCatalog()->haveIdIndex(&_opCtx));
@@ -174,6 +174,9 @@ protected:
     static const char* ns() {
         return "unittests.repltests";
     }
+    static NamespaceString nss() {
+        return NamespaceString(ns());
+    }
     static const char* cllNS() {
         return "local.oplog.rs";
     }
@@ -204,10 +207,10 @@ protected:
         Lock::GlobalWrite lk(&_opCtx);
         OldClientContext ctx(&_opCtx, ns());
         Database* db = ctx.db();
-        Collection* coll = db->getCollection(&_opCtx, ns());
+        Collection* coll = db->getCollection(&_opCtx, nss());
         if (!coll) {
             WriteUnitOfWork wunit(&_opCtx);
-            coll = db->createCollection(&_opCtx, ns());
+            coll = db->createCollection(&_opCtx, nss());
             wunit.commit();
         }
 
@@ -255,12 +258,13 @@ protected:
     void printAll(const char* ns) {
         Lock::GlobalWrite lk(&_opCtx);
         OldClientContext ctx(&_opCtx, ns);
+        NamespaceString nss(ns);
 
         Database* db = ctx.db();
-        Collection* coll = db->getCollection(&_opCtx, ns);
+        Collection* coll = db->getCollection(&_opCtx, nss);
         if (!coll) {
             WriteUnitOfWork wunit(&_opCtx);
-            coll = db->createCollection(&_opCtx, ns);
+            coll = db->createCollection(&_opCtx, nss);
             wunit.commit();
         }
 
@@ -273,13 +277,14 @@ protected:
     // These deletes don't get logged.
     void deleteAll(const char* ns) const {
         ::mongo::writeConflictRetry(&_opCtx, "deleteAll", ns, [&] {
+            NamespaceString nss(ns);
             Lock::GlobalWrite lk(&_opCtx);
             OldClientContext ctx(&_opCtx, ns);
             WriteUnitOfWork wunit(&_opCtx);
             Database* db = ctx.db();
-            Collection* coll = db->getCollection(&_opCtx, ns);
+            Collection* coll = db->getCollection(&_opCtx, nss);
             if (!coll) {
-                coll = db->createCollection(&_opCtx, ns);
+                coll = db->createCollection(&_opCtx, nss);
             }
 
             ASSERT_OK(coll->truncate(&_opCtx));
@@ -291,9 +296,9 @@ protected:
         OldClientContext ctx(&_opCtx, ns());
         WriteUnitOfWork wunit(&_opCtx);
         Database* db = ctx.db();
-        Collection* coll = db->getCollection(&_opCtx, ns());
+        Collection* coll = db->getCollection(&_opCtx, nss());
         if (!coll) {
-            coll = db->createCollection(&_opCtx, ns());
+            coll = db->createCollection(&_opCtx, nss());
         }
 
         OpDebug* const nullOpDebug = nullptr;