Revert "SERVER-18277 Clarify locking of Client when accessing its stored OperationContext."

This reverts commit 5c2d133871b2ad2adf6c617364d036ca25261f2d.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index a7d3de69b16..4b220a308dd 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -117,11 +117,14 @@ namespace mongo {
     void Client::setOperationContext(OperationContext* txn) {
         // We can only set the OperationContext once before resetting it.
         invariant(txn != NULL && _txn == NULL);
+
+        boost::unique_lock<SpinLock> uniqueLock(_lock);
         _txn = txn;
     }
 
     void Client::resetOperationContext() {
         invariant(_txn != NULL);
+        boost::unique_lock<SpinLock> uniqueLock(_lock);
         _txn = NULL;
     }