Let JVM print an exception and a backtrace of the stack. (#53)

Igor Tarasov · web-flow · commit e2bbae090005 · 2020-03-18T17:28:18.000+02:00
diff --git a/include/jni/errors.hpp b/include/jni/errors.hpp
@@ -66,7 +66,10 @@ namespace jni
 
     inline void CheckJavaException(JNIEnv& env)
        {
-        if (env.ExceptionCheck()) throw PendingJavaException();
+        if (env.ExceptionCheck()) {
+            env.ExceptionDescribe();
+            throw PendingJavaException();
+        }
        }
 
     inline void CheckJavaExceptionThenErrorCode(JNIEnv& env, jint err)
diff --git a/test/android/jni.h b/test/android/jni.h
@@ -532,7 +532,7 @@ struct _JNIEnv {
     { return functions->ExceptionOccurred(this); }
 
     void ExceptionDescribe()
-    { functions->ExceptionDescribe(this); }
+    { if (functions->ExceptionDescribe) functions->ExceptionDescribe(this); }
 
     void ExceptionClear()
     { functions->ExceptionClear(this); }
diff --git a/test/openjdk/jni.h b/test/openjdk/jni.h
@@ -825,7 +825,7 @@ struct JNIEnv_ {
         return functions->ExceptionOccurred(this);
     }
     void ExceptionDescribe() {
-        functions->ExceptionDescribe(this);
+        if (functions->ExceptionDescribe) functions->ExceptionDescribe(this);
     }
     void ExceptionClear() {
         functions->ExceptionClear(this);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,10 @@ namespace jni`
`66`	`66`
`67`	`67`	`inline void CheckJavaException(JNIEnv& env)`
`68`	`68`	`{`
`69`		`- if (env.ExceptionCheck()) throw PendingJavaException();`
	`69`	`+ if (env.ExceptionCheck()) {`
	`70`	`+ env.ExceptionDescribe();`
	`71`	`+ throw PendingJavaException();`
	`72`	`+ }`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`inline void CheckJavaExceptionThenErrorCode(JNIEnv& env, jint err)`
Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,7 @@ struct JNIEnv_ {`
`825`	`825`	`return functions->ExceptionOccurred(this);`
`826`	`826`	`}`
`827`	`827`	`void ExceptionDescribe() {`
`828`		`- functions->ExceptionDescribe(this);`
	`828`	`+ if (functions->ExceptionDescribe) functions->ExceptionDescribe(this);`
`829`	`829`	`}`
`830`	`830`	`void ExceptionClear() {`
`831`	`831`	`functions->ExceptionClear(this);`