summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/master_slave.cpp
diff options
context:
space:
mode:
authorErnie Hershey <ernie.hershey@10gen.com>2015-05-18 17:23:31 -0400
committerErnie Hershey <ernie.hershey@10gen.com>2015-05-18 17:23:31 -0400
commitd3fda5afd4f1d65f03e0e3ef01ffb82e4f60ce26 (patch)
tree831c13c2d1d05930af0db973b1827474cc37f81e /src/mongo/db/repl/master_slave.cpp
parenta3046362af4cb79a714c95783ca66f87f4d5a827 (diff)
downloadmongo-d3fda5afd4f1d65f03e0e3ef01ffb82e4f60ce26.tar.gz
Revert "Revert "SERVER-18515 Replace OperationContext::getCurOp with CurOp::get(OperationContext*)""
This reverts commit 7147e127644cba2bfa292945557b43664cc31f47.
Diffstat (limited to 'src/mongo/db/repl/master_slave.cpp')
-rw-r--r--src/mongo/db/repl/master_slave.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
index 2b5235bcc46..2a4ead26334 100644
--- a/src/mongo/db/repl/master_slave.cpp
+++ b/src/mongo/db/repl/master_slave.cpp
@@ -758,7 +758,7 @@ namespace repl {
// mongos will not send requests there. That's why the last argument is false (do not do
// version checking).
OldClientContext ctx(txn, ns, false);
- txn->getCurOp()->reset();
+ CurOp::get(txn)->reset();
bool empty = !ctx.db()->getDatabaseCatalogEntry()->hasUserData();
bool incompleteClone = incompleteCloneDbs.count( clientName ) != 0;