SERVER-14995 Move _killPending from CurOp to OperationContext.

Also, limit the lifetime of OperationContext in MongoD so that it goes out of
scope before sending a reply to the client.  This is necessary so that
operations do not appear in the currentOp command result after the server
sends a response to the client.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/operation_context_noop.h b/src/mongo/db/operation_context_noop.h
index 254f553445b..cd73c42dee0 100644
--- a/src/mongo/db/operation_context_noop.h
+++ b/src/mongo/db/operation_context_noop.h
@@ -88,8 +88,8 @@ namespace mongo {
             return &_pm;
         }
 
-        virtual void checkForInterrupt() const override { }
-        virtual Status checkForInterruptNoAssert() const override {
+        virtual void checkForInterrupt() override { }
+        virtual Status checkForInterruptNoAssert() override {
             return Status::OK();
         }