* jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'.

From-SVN: r33285

* jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'.
From-SVN: r33285
6e84eab8 · Tom Tromey · Tom Tromey · 06a50fff · 6e84eab8 · 6e84eab8
Commit 6e84eab8 authored Apr 20, 2000 by Tom Tromey Committed by Tom Tromey Apr 20, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletions

libjava/ChangeLog
+4 -0

libjava/jni.cc
+5 -1

No files found.
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
+2000-04-20  Tom Tromey  <tromey@cygnus.com>
+
+	* jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'.
+
 2000-04-19  Tom Tromey  <tromey@cygnus.com>

 	* jni.cc (_Jv_JNI_FindClass): Use system class loader if class

--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -357,7 +357,11 @@ _Jv_JNI_PopSystemFrame (JNIEnv *env)
  _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM);

  if (env->ex)
-    throw env->ex;
+    {
+      jthrowable t = env->ex;
+      env->ex = NULL;
+      throw t;
+    }
 }

 // This function is used from other template functions.  It wraps the