Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TryCatch: It is more thread safe to use isolate passed explicitly rather than relying on it retrieved via a static call in constructor. #308

Merged
merged 1 commit into from
Jul 21, 2017
Merged

TryCatch: It is more thread safe to use isolate passed explicitly rather than relying on it retrieved via a static call in constructor. #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions jni/com_eclipsesource_v8_V8Impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ bool runScript(Isolate* isolate, JNIEnv *env, Local<Script> *script, TryCatch* t
JNIEXPORT void JNICALL Java_com_eclipsesource_v8_V8__1executeVoidScript
(JNIEnv * env, jobject v8, jlong v8RuntimePtr, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, );
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch))
return;
Expand All @@ -752,7 +752,7 @@ JNIEXPORT void JNICALL Java_com_eclipsesource_v8_V8__1executeVoidScript
JNIEXPORT jdouble JNICALL Java_com_eclipsesource_v8_V8__1executeDoubleScript
(JNIEnv * env, jobject v8, jlong v8RuntimePtr, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, 0);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
Local<Value> result;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch))
Expand All @@ -766,7 +766,7 @@ JNIEXPORT jdouble JNICALL Java_com_eclipsesource_v8_V8__1executeDoubleScript
JNIEXPORT jboolean JNICALL Java_com_eclipsesource_v8_V8__1executeBooleanScript
(JNIEnv *env, jobject v8, jlong v8RuntimePtr, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, false);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
Local<Value> result;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch))
Expand All @@ -780,7 +780,7 @@ JNIEXPORT jboolean JNICALL Java_com_eclipsesource_v8_V8__1executeBooleanScript
JNIEXPORT jstring JNICALL Java_com_eclipsesource_v8_V8__1executeStringScript
(JNIEnv *env, jobject v8, jlong v8RuntimePtr, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, NULL);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
Local<Value> result;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch))
Expand All @@ -795,7 +795,7 @@ JNIEXPORT jstring JNICALL Java_com_eclipsesource_v8_V8__1executeStringScript
JNIEXPORT jint JNICALL Java_com_eclipsesource_v8_V8__1executeIntegerScript
(JNIEnv * env, jobject v8, jlong v8RuntimePtr, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, 0);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
Local<Value> result;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch))
Expand All @@ -809,7 +809,7 @@ JNIEXPORT jint JNICALL Java_com_eclipsesource_v8_V8__1executeIntegerScript
JNIEXPORT jobject JNICALL Java_com_eclipsesource_v8_V8__1executeScript
(JNIEnv *env, jobject v8, jlong v8RuntimePtr, jint expectedType, jstring jjstring, jstring jscriptName = NULL, jint jlineNumber = 0) {
Isolate* isolate = SETUP(env, v8RuntimePtr, NULL);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
Local<Script> script;
Local<Value> result;
if (!compileScript(isolate, jjstring, env, jscriptName, jlineNumber, script, &tryCatch)) { return NULL; }
Expand All @@ -831,7 +831,7 @@ bool invokeFunction(JNIEnv *env, Isolate* isolate, jlong &v8RuntimePtr, jlong &r
Handle<Object> object = Local<Object>::New(isolate, *reinterpret_cast<Persistent<Object>*>(functionHandle));
Handle<Object> receiver = Local<Object>::New(isolate, *reinterpret_cast<Persistent<Object>*>(receiverHandle));
Handle<Function> func = Handle<Function>::Cast(object);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
result = func->Call(receiver, size, args);
if (args != NULL) {
delete(args);
Expand All @@ -858,7 +858,7 @@ bool invokeFunction(JNIEnv *env, Isolate* isolate, jlong &v8RuntimePtr, jlong &o
}
Handle<Value> value = parentObject->Get(functionName);
Handle<Function> func = Handle<Function>::Cast(value);
TryCatch tryCatch;
TryCatch tryCatch(isolate);
result = func->Call(parentObject, size, args);
if (args != NULL) {
delete(args);
Expand Down