Revert "SERVER-18515 Replace OperationContext::getCurOp with CurOp::get(OperationContext*)"

This reverts commit d5bf63455aa614d98ac840f09ce5ca6b813b9507.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/db/commands/current_op.cpp b/src/mongo/db/commands/current_op.cpp
index 7d3957ea42f..0bb4576c954 100644
--- a/src/mongo/db/commands/current_op.cpp
+++ b/src/mongo/db/commands/current_op.cpp
@@ -111,11 +111,9 @@ namespace mongo {
 
                 if (!includeAll) {
                     // Skip over inactive connections.
-                    if (!opCtx)
-                        continue;
-                    auto curOp = CurOp::get(opCtx);
-                    if (!curOp || !curOp->active())
+                    if (!opCtx || !opCtx->getCurOp() || !opCtx->getCurOp()->active()) {
                         continue;
+                    }
                 }
 
                 BSONObjBuilder infoBuilder;
@@ -126,8 +124,8 @@ namespace mongo {
                 // Operation context specific information
                 if (opCtx) {
                     // CurOp
-                    if (CurOp::get(opCtx)) {
-                        CurOp::get(opCtx)->reportState(&infoBuilder);
+                    if (opCtx->getCurOp()) {
+                        opCtx->getCurOp()->reportState(&infoBuilder);
                     }
 
                     // LockState