Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Java: Don't free locals after detaching thread.

Browse Source 
We use a smart pointer to hold local java variables, and it was getting
destructed after DetachCurrentThread() was called, causing a JVM crash.
This commit is contained in:
Peter Johnson
2015-09-11 16:28:58 -07:00
parent a2ec638db8
commit 5181c4e5be
1 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
java/lib/NetworkTablesJNI.cpp
View File

@@ -882,31 +882,24 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
return;
if (!env || !env->functions) return;
// get the handler
auto handler = listener_global->obj(env);
if (!handler) {
// can happen due to weak reference
jvm->DetachCurrentThread();
return;
{
// get the handler
auto handler = listener_global->obj(env);
if (!handler) goto done; // can happen due to weak reference
// convert the value into the appropriate Java type
jobject jobj = ToJavaObject(env, *value);
if (!jobj) goto done;
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
goto done;
}
env->CallVoidMethod(handler, mid, (jint)uid, ToJavaString(env, name),
jobj, (jboolean)(is_new ? 1 : 0));
if (env->ExceptionCheck()) env->ExceptionDescribe();
}
// convert the value into the appropriate Java type
jobject jobj = ToJavaObject(env, *value);
if (!jobj) {
jvm->DetachCurrentThread();
return;
}
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
jvm->DetachCurrentThread();
return;
}
env->CallVoidMethod(handler, mid, (jint)uid, ToJavaString(env, name),
jobj, (jboolean)(is_new ? 1 : 0));
if (env->ExceptionCheck()) env->ExceptionDescribe();
done:
jvm->DetachCurrentThread();
},
immediateNotify != JNI_FALSE);
@@ -955,31 +948,24 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
return;
if (!env || !env->functions) return;
// get the handler
auto handler = listener_global->obj(env);
if (!handler) {
// can happen due to weak reference
jvm->DetachCurrentThread();
return;
{
// get the handler
auto handler = listener_global->obj(env);
if (!handler) goto done; // can happen due to weak reference
// convert into the appropriate Java type
jobject jobj = ToJavaObject(env, conn);
if (!jobj) goto done;
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
goto done;
}
env->CallVoidMethod(handler, mid, (jint)uid,
(jboolean)(connected ? 1 : 0), jobj);
if (env->ExceptionCheck()) env->ExceptionDescribe();
}
// convert into the appropriate Java type
jobject jobj = ToJavaObject(env, conn);
if (!jobj) {
jvm->DetachCurrentThread();
return;
}
if (env->ExceptionCheck()) {
env->ExceptionDescribe();
jvm->DetachCurrentThread();
return;
}
env->CallVoidMethod(handler, mid, (jint)uid,
(jboolean)(connected ? 1 : 0), jobj);
if (env->ExceptionCheck()) env->ExceptionDescribe();
done:
jvm->DetachCurrentThread();
},
immediateNotify != JNI_FALSE);
@@ -1200,18 +1186,16 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
return;
if (!env || !env->functions) return;
// get the handler
auto handler = func_global->obj();
if (!handler) {
// shouldn't happen, but ignore if it does
jvm->DetachCurrentThread();
return;
{
// get the handler
auto handler = func_global->obj();
if (!handler) goto done; // shouldn't happen, but ignore if it does
env->CallVoidMethod(handler, mid, (jint)level, ToJavaString(env, file),
(jint)line, ToJavaString(env, msg));
if (env->ExceptionCheck()) env->ExceptionDescribe();
}
env->CallVoidMethod(handler, mid, (jint)level, ToJavaString(env, file),
(jint)line, ToJavaString(env, msg));
if (env->ExceptionCheck()) env->ExceptionDescribe();
done:
jvm->DetachCurrentThread();
},
minLevel);