1 files changed, 8 insertions, 8 deletions

diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 192c883a050..3aaaf967107 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -1018,8 +1018,8 @@ namespace mongo {
             const string ns = parseNs(dbname, jsobj);
 
             // TODO: OldClientContext legacy, needs to be removed
-            txn->getCurOp()->ensureStarted();
-            txn->getCurOp()->setNS(dbname);
+            CurOp::get(txn)->ensureStarted();
+            CurOp::get(txn)->setNS(dbname);
 
             // We lock the entire database in S-mode in order to ensure that the contents will not
             // change for the stats snapshot. This might be unnecessary and if it becomes a
@@ -1048,7 +1048,7 @@ namespace mongo {
             }
             else {
                 // TODO: OldClientContext legacy, needs to be removed
-                txn->getCurOp()->enter(dbname.c_str(), db->getProfilingLevel());
+                CurOp::get(txn)->enter(dbname.c_str(), db->getProfilingLevel());
 
                 db->getStats(txn, &result, scale);
             }
@@ -1078,7 +1078,7 @@ namespace mongo {
                          int,
                          string& errmsg,
                          BSONObjBuilder& result) {
-            result << "you" << txn->getCurOp()->getRemoteString();
+            result << "you" << CurOp::get(txn)->getRemoteString();
             return true;
         }
     } cmdWhatsMyUri;
@@ -1216,7 +1216,7 @@ namespace {
         scoped_ptr<MaintenanceModeSetter> mmSetter;
 
         if ( cmdObj["help"].trueValue() ) {
-            txn->getCurOp()->ensureStarted();
+            CurOp::get(txn)->ensureStarted();
             stringstream ss;
             ss << "help for: " << c->name << " ";
             c->help( ss );
@@ -1295,7 +1295,7 @@ namespace {
             LOG( 2 ) << "command: " << cmdObj << endl;
         }
 
-        txn->getCurOp()->setCommand(c);
+        CurOp::get(txn)->setCommand(c);
 
         if (c->maintenanceMode()) {
             mmSetter.reset(new MaintenanceModeSetter);
@@ -1319,7 +1319,7 @@ namespace {
             return;
         }
 
-        txn->getCurOp()->setMaxTimeMicros(static_cast<unsigned long long>(maxTimeMS.getValue())
+        CurOp::get(txn)->setMaxTimeMicros(static_cast<unsigned long long>(maxTimeMS.getValue())
                                           * 1000);
         try {
             txn->checkForInterrupt(); // May trigger maxTimeAlwaysTimeOut fail point.
@@ -1332,7 +1332,7 @@ namespace {
         std::string errmsg;
         bool retval = false;
 
-        txn->getCurOp()->ensureStarted();
+        CurOp::get(txn)->ensureStarted();
 
         c->_commandsExecuted.increment();