Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added better error reporting

This commit is contained in:
Frank Celler 2014-02-22 13:00:00 +01:00
parent 1bdcc145b4
commit a2fb92948e
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/V8/v8-utils.cpp
View File

@ -765,7 +765,13 @@ static v8::Handle<v8::Value> JS_Execute (v8::Arguments const& argv) {
}
// execute script inside the context
v8::Handle<v8::Script> script = v8::Script::Compile(source->ToString(), filename);
v8::Handle<v8::Script> script;
v8::Handle<v8::Value> result;
{
v8::TryCatch tryCatch;
script = v8::Script::Compile(source->ToString(), filename);
// compilation failed, print errors that happened during compilation
if (script.IsEmpty()) {
@ -774,11 +780,12 @@ static v8::Handle<v8::Value> JS_Execute (v8::Arguments const& argv) {
context->Exit();
}
return scope.Close(v8::Undefined());
TRI_LogV8Exception(&tryCatch);
return scope.Close(v8::ThrowException(tryCatch.Exception()));
}
// compilation succeeded, run the script
v8::Handle<v8::Value> result = script->Run();
result = script->Run();
if (result.IsEmpty()) {
if (useSandbox) {
@ -786,7 +793,9 @@ static v8::Handle<v8::Value> JS_Execute (v8::Arguments const& argv) {
context->Exit();
}
return scope.Close(v8::Undefined());
TRI_LogV8Exception(&tryCatch);
return scope.Close(v8::ThrowException(tryCatch.Exception()));
}
}
// copy result back into the sandbox