diff options
| author | Jason Carey <jcarey@argv.me> | 2015-07-30 11:21:15 -0400 |
|---|---|---|
| committer | Jason Carey <jcarey@argv.me> | 2015-07-30 17:57:49 -0400 |
| commit | 3feccd233307a8a4fc81e312d072046f8cf2f499 (patch) | |
| tree | 122e0780916493f8a17450d6defa539a95487c5d /src/mongo/scripting/mozjs/jsthread.cpp | |
| parent | fe1a91d5c8fa5d9b83af81f7523a3a4e51d9f9a5 (diff) | |
| download | mongo-3feccd233307a8a4fc81e312d072046f8cf2f499.tar.gz | |
SERVER-19612 JSThread exceptions lost on SM
After we return from JS::Call we don't have exceptions pending, they've
already been captured by the error handler. Handle JSThread exceptions
like the others and return them correctly.
Diffstat (limited to 'src/mongo/scripting/mozjs/jsthread.cpp')
| -rw-r--r-- | src/mongo/scripting/mozjs/jsthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/scripting/mozjs/jsthread.cpp b/src/mongo/scripting/mozjs/jsthread.cpp index 24b4c5d88af..9d409fa9beb 100644 --- a/src/mongo/scripting/mozjs/jsthread.cpp +++ b/src/mongo/scripting/mozjs/jsthread.cpp @@ -177,7 +177,7 @@ private: } catch (...) { auto status = exceptionToStatus(); - log() << "js thread threw c++ exception: " << status; + log() << "js thread raised js exception: " << status; _sharedData->setErrored(true); _sharedData->_returnData = BSON("ret" << BSONUndefined); } |