summaryrefslogtreecommitdiff
path: root/src/mongo/scripting
diff options
context:
space:
mode:
authoragirbal <antoine@10gen.com>2012-03-08 14:42:45 -0800
committeragirbal <antoine@10gen.com>2012-03-08 14:44:54 -0800
commitd9579b080d1098166172fc94432a415afc85c60a (patch)
tree55ca8d02f595bdcf07da5f9c975442bb78e5cec6 /src/mongo/scripting
parent0aa594375d88e59a6b8fe92e22142dd5e73d277b (diff)
downloadmongo-d9579b080d1098166172fc94432a415afc85c60a.tar.gz
SERVER-5250: Assertion error in mr_errorhandling.js
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r--src/mongo/scripting/engine_v8.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index f6051af1465..e12987aa3d4 100644
--- a/src/mongo/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
@@ -820,7 +820,7 @@ namespace mongo {
if ( result.IsEmpty() ) {
stringstream ss;
- if ( try_catch.HasCaught() ) { //&& !try_catch.CanContinue() ) {
+ if ( try_catch.HasCaught() && !try_catch.CanContinue() ) {
ss << "error in invoke: " << globalScriptEngine->checkInterrupt();
}
else {