summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Becker <ben.becker@10gen.com>2013-02-20 12:51:02 -0800
committerBen Becker <ben.becker@10gen.com>2013-02-20 12:51:02 -0800
commit1dce1ffee15f9d07958b3300cb020252a9402e3e (patch)
tree46504bebc7512dfdf7a511350dfbdfa2e1ea472e
parent14ed13866d9b88f8cdf5d3456882197f7530798e (diff)
downloadmongo-1dce1ffee15f9d07958b3300cb020252a9402e3e.tar.gz
SERVER-8635: fix crash caused by executing mr::State::~State() after JS exception
-rw-r--r--src/mongo/db/commands/mr.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index 632ea4e73ad..f63ae452379 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -603,19 +603,6 @@ namespace mongo {
error() << "couldn't cleanup after map reduce: " << e.what() << endl;
}
}
-
- if (_scope && !_scope->isKillPending()) {
- // cleanup js objects
- try {
- ScriptingFunction cleanup =
- _scope->createFunction("delete _emitCt; delete _keyCt; delete _mrMap;");
- _scope->invoke(cleanup, 0, 0, 0, true);
- }
- catch (const DBException &) {
- // not important because properties will be reset if scope is reused
- LOG(1) << "MapReduce terminated during state destruction" << endl;
- }
- }
}
/**