summaryrefslogtreecommitdiff
path: root/src/mongo/db/commands/mr.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/commands/mr.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/commands/mr.cpp')
-rw-r--r--src/mongo/db/commands/mr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index 532d5423cf5..5462e7abb93 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -1298,7 +1298,7 @@ namespace mongo {
"Cannot run mapReduce command from eval()"));
}
- CurOp* op = txn->getCurOp();
+ CurOp* op = CurOp::get(txn);
Config config( dbname , cmd );
@@ -1590,7 +1590,7 @@ namespace mongo {
inputNS = dbname + "." + shardedOutputCollection;
}
- CurOp * op = txn->getCurOp();
+ CurOp * op = CurOp::get(txn);
Config config( dbname , cmdObj.firstElement().embeddedObjectUserCheck() );
State state(txn, config);