summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2015-02-09 16:53:28 -0500
committerRamon Fernandez <ramon.fernandez@mongodb.com>2015-02-09 18:04:34 -0500
commit425e072cc40c4389d1761f43f2900c117c96909c (patch)
treec7877f58f567b3e618aef8de35b1d97d4c4d49a0
parentf0e6b92744cbe03aa9d395169231774fd6d7ea06 (diff)
downloadmongo-425e072cc40c4389d1761f43f2900c117c96909c.tar.gz
SERVER-17236 remove invalid invariant() from CachedPlanStage::isEOF()
(cherry picked from commit 978356d01c456f037efaaca9c7d2299705151e4d)
-rw-r--r--src/mongo/db/exec/cached_plan.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/exec/cached_plan.cpp b/src/mongo/db/exec/cached_plan.cpp
index cd4f0aca42d..2bc2e39bd1b 100644
--- a/src/mongo/db/exec/cached_plan.cpp
+++ b/src/mongo/db/exec/cached_plan.cpp
@@ -76,7 +76,10 @@ namespace mongo {
}
bool CachedPlanStage::isEOF() {
- invariant(!_killed);
+ if (_killed) {
+ return true;
+ }
+
return getActiveChild()->isEOF();
}