Revert "SERVER-14995 Move operation id, lockState and client fields to OperationContext."

This reverts commit 4ea38c308da292f43e29d32b1b53b7324db0bafe.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/mongo/db/service_context_d.cpp b/src/mongo/db/service_context_d.cpp
index a9b22a986fb..eb00449c625 100644
--- a/src/mongo/db/service_context_d.cpp
+++ b/src/mongo/db/service_context_d.cpp
@@ -227,11 +227,14 @@ namespace mongo {
         if (!opCtx) {
             return false;
         }
-        if (opCtx->getOpID() != opId) {
-            return false;
+        for( CurOp *k = CurOp::get(opCtx); k; k = k->parent() ) {
+            if ( k->opNum() != opId )
+                continue;
+
+            _killOperation_inlock(opCtx);
+            return true;
         }
-        _killOperation_inlock(opCtx);
-        return true;
+        return false;
     }
 
     void ServiceContextMongoD::_killOperation_inlock(OperationContext* opCtx) {
@@ -292,8 +295,8 @@ namespace mongo {
         _killOpListeners.push_back(listener);
     }
 
-    std::unique_ptr<OperationContext> ServiceContextMongoD::newOpCtx() {
-        return stdx::make_unique<OperationContextImpl>();
+    OperationContext* ServiceContextMongoD::newOpCtx() {
+        return new OperationContextImpl();
     }
 
     void ServiceContextMongoD::setOpObserver(std::unique_ptr<OpObserver> opObserver) {