summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTad Marshall <tad@10gen.com>2013-05-30 05:36:59 -0400
committerTad Marshall <tad@10gen.com>2013-07-29 12:32:23 -0400
commitec902210eb2a7e9c5e4818f8c39328da493a5df4 (patch)
tree6f92aa9f289efd7c1c688114b98d03115ca6762c
parent551c30f0061d38f3296ea095d4f7a8c160b6b10e (diff)
downloadmongo-ec902210eb2a7e9c5e4818f8c39328da493a5df4.tar.gz
SERVER-8926 Remove extra error text and 'L' line number prefix
-rw-r--r--src/mongo/scripting/engine_v8.cpp2
-rw-r--r--src/mongo/scripting/engine_v8.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index 7ffebec383e..6ca24c1392b 100644
--- a/src/mongo/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
@@ -919,7 +919,7 @@ namespace mongo {
// script loaded from file
ss << " at " << *resourceName;
const int linenum = message->GetLineNumber();
- if (linenum != 1) ss << ":L" << linenum;
+ if (linenum != 1) ss << ":" << linenum;
}
return ss.str();
}
diff --git a/src/mongo/scripting/engine_v8.h b/src/mongo/scripting/engine_v8.h
index 448ab38af26..442441c55ce 100644
--- a/src/mongo/scripting/engine_v8.h
+++ b/src/mongo/scripting/engine_v8.h
@@ -530,7 +530,7 @@ namespace mongo {
if (try_catch.HasCaught() && try_catch.CanContinue()) {
// normal JS exception
- _error = string("JavaScript execution failed: ") + v8ExceptionToSTLString(&try_catch);
+ _error = v8ExceptionToSTLString(&try_catch);
haveError = true;
}
else if (hasOutOfMemoryException()) {