commit c4378df76edd637273813fef4da7f01c4e637def
author Elliott Hughes <enh@google.com> Fri Jun 14 17:05:13 2013 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 14 17:05:13 2013 -0700
tree 0ef335a4ffe4bbcae7462467f2b251c00edd7106
parent da831ff1f966cb0126959e57c49314cec39b1407

Make it possible to call JNIEnv::FatalError with a pending exception.

Change-Id: Ibe1886119213e5e2bac61a61abc0b66690925471

src/check_jni.cc

diff --git a/src/check_jni.cc b/src/check_jni.cc
index 19f8abf..f4ea235 100644
--- a/src/check_jni.cc
+++ b/src/check_jni.cc
@@ -1215,7 +1215,10 @@
   }
 
   static void FatalError(JNIEnv* env, const char* msg) {
-    CHECK_JNI_ENTRY(kFlag_NullableUtf, "Eu", env, msg);
+    // The JNI specification doesn't say it's okay to call FatalError with a pending exception,
+    // but you're about to abort anyway, and it's quite likely that you have a pending exception,
+    // and it's not unimaginable that you don't know that you do. So we allow it.
+    CHECK_JNI_ENTRY(kFlag_ExcepOkay | kFlag_NullableUtf, "Eu", env, msg);
     baseEnv(env)->FatalError(env, msg);
     CHECK_JNI_EXIT_VOID();
   }