OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jni.cc (_Jv_JNI_PopSystemFrame): If environment has exception set, throw it.

Browse Source 
* jni.cc (_Jv_JNI_PopSystemFrame): If environment has exception
	set, throw it.
	(call): Don't throw exception here.

From-SVN: r32770
This commit is contained in:
Tom Tromey 2000-03-27 19:51:46 +00:00 committed by Tom Tromey
parent 5f11c81270
commit 4e2d1dbdd3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2000-03-26 Tom Tromey <tromey@cygnus.com>
* jni.cc (_Jv_JNI_PopSystemFrame): If environment has exception
set, throw it.
(call): Don't throw exception here.
2000-03-26 Tom Tromey <tromey@cygnus.com>
* java/lang/mprec.h: Use SIZEOF_VOID_P.

6
libjava/jni.cc
View File

@ -298,6 +298,9 @@ extern "C" void
_Jv_JNI_PopSystemFrame (JNIEnv *env)
{
_Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM);
if (env->ex)
throw env->ex;
}
// This function is used from other template functions. It wraps the
@ -1723,9 +1726,6 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
ret, real_args);
_Jv_JNI_PopSystemFrame (env);
if (env->ex)
JvThrow (env->ex);
}
#endif /* INTERPRETER */