From 6e84eab83fe52854c2675e7526a89327cc90c0c7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 20 Apr 2000 17:39:30 +0000 Subject: [PATCH] * jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'. From-SVN: r33285 --- libjava/ChangeLog | 4 ++++ libjava/jni.cc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f5806da..79ab555 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2000-04-20 Tom Tromey + + * jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'. + 2000-04-19 Tom Tromey * jni.cc (_Jv_JNI_FindClass): Use system class loader if class diff --git a/libjava/jni.cc b/libjava/jni.cc index cd45ab8..020f7e8 100644 --- 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 -- 2.7.4