SERVER-15675 Stages should clear their OperationContext in saveState()

While state is saved, threads pass in their own OperationContext to
invalidate().  When state is restored, the stage will resume with the
OperationContext passed in to restoreState().

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mongo/db/exec/text.cpp b/src/mongo/db/exec/text.cpp
index 60441eb2a81..d06f302e43b 100644
--- a/src/mongo/db/exec/text.cpp
+++ b/src/mongo/db/exec/text.cpp
@@ -109,6 +109,7 @@ namespace mongo {
     }
 
     void TextStage::saveState() {
+        _txn = NULL;
         ++_commonStats.yields;
 
         for (size_t i = 0; i < _scanners.size(); ++i) {
@@ -117,6 +118,7 @@ namespace mongo {
     }
 
     void TextStage::restoreState(OperationContext* opCtx) {
+        invariant(_txn == NULL);
         _txn = opCtx;
         ++_commonStats.unyields;