glue: check return value of JNIEnv::GetJavaVM(), no exception thrown

stephengold · stephengold · commit 47f17effa845 · 2026-02-26T23:09:57.000-08:00
diff --git a/src/main/native/glue/cu/CustomBodyActivationListener.cpp b/src/main/native/glue/cu/CustomBodyActivationListener.cpp
@@ -40,7 +40,8 @@ class CustomBodyActivationListener : BodyActivationListener {
 
 public:
     CustomBodyActivationListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCastRayCollector.cpp b/src/main/native/glue/cu/CustomCastRayCollector.cpp
@@ -37,7 +37,8 @@ class CustomCastRayCollector : CastRayCollector {
 
 public:
     CustomCastRayCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCastShapeBodyCollector.cpp b/src/main/native/glue/cu/CustomCastShapeBodyCollector.cpp
@@ -37,7 +37,8 @@ class CustomCastShapeBodyCollector : CastShapeBodyCollector {
 
 public:
     CustomCastShapeBodyCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCastShapeCollector.cpp b/src/main/native/glue/cu/CustomCastShapeCollector.cpp
@@ -37,7 +37,8 @@ class CustomCastShapeCollector : CastShapeCollector {
 
 public:
     CustomCastShapeCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCharacterContactListener.cpp b/src/main/native/glue/cu/CustomCharacterContactListener.cpp
@@ -47,7 +47,8 @@ class CustomCharacterContactListener : CharacterContactListener {
 
 public:
     CustomCharacterContactListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCollidePointCollector.cpp b/src/main/native/glue/cu/CustomCollidePointCollector.cpp
@@ -37,7 +37,8 @@ class CustomCollidePointCollector : CollidePointCollector {
 
 public:
     CustomCollidePointCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCollideShapeBodyCollector.cpp b/src/main/native/glue/cu/CustomCollideShapeBodyCollector.cpp
@@ -37,7 +37,8 @@ class CustomCollideShapeBodyCollector : CollideShapeBodyCollector {
 
 public:
     CustomCollideShapeBodyCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomCollideShapeCollector.cpp b/src/main/native/glue/cu/CustomCollideShapeCollector.cpp
@@ -37,7 +37,8 @@ class CustomCollideShapeCollector : CollideShapeCollector {
 
 public:
     CustomCollideShapeCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomContactListener.cpp b/src/main/native/glue/cu/CustomContactListener.cpp
@@ -40,7 +40,8 @@ class CustomContactListener : ContactListener {
 
 public:
     CustomContactListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomDebugRendererSimple.cpp b/src/main/native/glue/cu/CustomDebugRendererSimple.cpp
@@ -40,7 +40,8 @@ class CustomDebugRendererSimple : public DebugRendererSimple {
 
 public:
     CustomDebugRendererSimple(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomLoader.cpp b/src/main/native/glue/cu/CustomLoader.cpp
@@ -38,7 +38,8 @@ class CustomLoader : Loader {
 
 public:
     CustomLoader(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(mJavaObject);
diff --git a/src/main/native/glue/cu/CustomPhysicsStepListener.cpp b/src/main/native/glue/cu/CustomPhysicsStepListener.cpp
@@ -37,7 +37,8 @@ class CustomPhysicsStepListener : PhysicsStepListener {
 
 public:
     CustomPhysicsStepListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomRayCastBodyCollector.cpp b/src/main/native/glue/cu/CustomRayCastBodyCollector.cpp
@@ -37,7 +37,8 @@ class CustomRayCastBodyCollector : RayCastBodyCollector {
 
 public:
     CustomRayCastBodyCollector(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/cu/CustomSoftBodyContactListener.cpp b/src/main/native/glue/cu/CustomSoftBodyContactListener.cpp
@@ -39,7 +39,8 @@ class CustomSoftBodyContactListener : SoftBodyContactListener {
 
 public:
     CustomSoftBodyContactListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/d/Decomposer.cpp b/src/main/native/glue/d/Decomposer.cpp
@@ -40,8 +40,8 @@ class Decomposer : public IVHACD::IUserCallback, public IVHACD::IUserLogger {
      * constructor:
      */
     Decomposer(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
-        EXCEPTION_CHECK(pEnv)
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
 
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
diff --git a/src/main/native/glue/f/FilteredContactListener.cpp b/src/main/native/glue/f/FilteredContactListener.cpp
@@ -61,7 +61,8 @@ class FilteredContactListener : ContactListener {
     ObjectLayerPairFilter *mpOlpFilter = nullptr;
     // constructor:
     FilteredContactListener(JNIEnv *pEnv, jobject javaObject) {
-        pEnv->GetJavaVM(&mpVM);
+        const jint retCode = pEnv->GetJavaVM(&mpVM);
+        JPH_ASSERT(JNI_OK == retCode);
         mJavaObject = pEnv->NewGlobalRef(javaObject);
         JPH_ASSERT(NULL != mJavaObject);
         const jclass clss = pEnv->FindClass(
diff --git a/src/main/native/glue/j/Jolt.cpp b/src/main/native/glue/j/Jolt.cpp
@@ -378,8 +378,8 @@ static void AndroidTrace(const char *inFormat, ...) {
 JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_Jolt_installAndroidTraceCallback
   (JNIEnv *pEnv, jclass, jint priority, jstring tag) {
 #ifdef ANDROID
-    jint fail = pEnv->GetJavaVM(&gpVM);
-    JPH_ASSERT(0 == fail);
+    const jint retCode = pEnv->GetJavaVM(&gpVM);
+    JPH_ASSERT(JNI_OK == retCode);
     gLogClass = pEnv->FindClass("android/util/Log");
     JPH_ASSERT(NULL != gLogClass);
     EXCEPTION_CHECK(pEnv)
@@ -576,7 +576,8 @@ static void JavaTrace(const char *inFormat, ...) {
  */
 JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_Jolt_installJavaTraceCallback
   (JNIEnv *pEnv, jclass, jobject stream) {
-    pEnv->GetJavaVM(&gpVM);
+    const jint retCode = pEnv->GetJavaVM(&gpVM);
+    JPH_ASSERT(JNI_OK == retCode);
     gTraceStream = pEnv->NewGlobalRef(stream);
     JPH_ASSERT(NULL != gTraceStream);
     //
