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

Fixes some JNI issues with method calling and class storage (#1043)

Browse Source
This commit is contained in:
Thad House
2018-05-10 22:38:21 -07:00
committed by Peter Johnson
parent 665a6e356a
commit 1046371349
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hal/src/main/native/cpp/jni/HALUtil.cpp
View File

@@ -217,7 +217,7 @@ void SetCanStatusObject(JNIEnv *env, jobject canStatus,
uint32_t transmitErrorCount) {
static jmethodID func = env->GetMethodID(canStatusCls, "setStatus",
"(DIIII)V");
env->CallObjectMethod(canStatus, func, (jdouble)percentBusUtilization,
env->CallVoidMethod(canStatus, func, (jdouble)percentBusUtilization,
(jint)busOffCount, (jint)txFullCount,
(jint)receiveErrorCount, (jint)transmitErrorCount);
}
@@ -227,7 +227,7 @@ void SetMatchInfoObject(JNIEnv* env, jobject matchStatus,
static jmethodID func = env->GetMethodID(matchInfoDataCls, "setData",
"(Ljava/lang/String;Ljava/lang/String;III)V");
env->CallObjectMethod(matchStatus, func,
env->CallVoidMethod(matchStatus, func,
MakeJString(env, matchInfo.eventName),
MakeJString(env, matchInfo.gameSpecificMessage),
(jint)matchInfo.matchNumber,
@@ -240,7 +240,7 @@ void SetAccumulatorResultObject(JNIEnv* env, jobject accumulatorResult,
static jmethodID func = env->GetMethodID(accumulatorResultCls, "set",
"(JJ)V");
env->CallObjectMethod(accumulatorResult, func, (jlong)value, (jlong)count);
env->CallVoidMethod(accumulatorResult, func, (jlong)value, (jlong)count);
}
JavaVM* GetJVM() {
@@ -336,6 +336,7 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
pwmConfigDataResultCls.free(env);
canStatusCls.free(env);
matchInfoDataCls.free(env);
accumulatorResultCls.free(env);
jvm = nullptr;
}