diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-20 17:39:30 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-20 17:39:30 +0000 |
| commit | df05d14aef99ec10fe7b6cce5998d694bb4011b7 (patch) | |
| tree | c3ab210b51d805071744525b1e5c62e9253b4eb7 /libjava | |
| parent | 24d8c4e40388e2be4e9f1873f70385e458706386 (diff) | |
| download | ppe42-gcc-df05d14aef99ec10fe7b6cce5998d694bb4011b7.tar.gz ppe42-gcc-df05d14aef99ec10fe7b6cce5998d694bb4011b7.zip | |
* jni.cc (_Jv_JNI_PopSystemFrame): Clear `env->ex'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33285 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/jni.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f5806da6bba..79ab55511e6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/libjava/jni.cc b/libjava/jni.cc index cd45ab8feb2..020f7e85696 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 |
