Commit 4e2d1dbd by Tom Tromey Committed by Tom Tromey

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

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

From-SVN: r32770
parent 5f11c812
2000-03-26 Tom Tromey <tromey@cygnus.com> 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. * java/lang/mprec.h: Use SIZEOF_VOID_P.
* interpret.cc: Use SIZEOF_VOID_P. * interpret.cc: Use SIZEOF_VOID_P.
* include/java-cpool.h (_Jv_storeLong): Use SIZEOF_VOID_P. * include/java-cpool.h (_Jv_storeLong): Use SIZEOF_VOID_P.
......
...@@ -298,6 +298,9 @@ extern "C" void ...@@ -298,6 +298,9 @@ extern "C" void
_Jv_JNI_PopSystemFrame (JNIEnv *env) _Jv_JNI_PopSystemFrame (JNIEnv *env)
{ {
_Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM); _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM);
if (env->ex)
throw env->ex;
} }
// This function is used from other template functions. It wraps the // 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) ...@@ -1723,9 +1726,6 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
ret, real_args); ret, real_args);
_Jv_JNI_PopSystemFrame (env); _Jv_JNI_PopSystemFrame (env);
if (env->ex)
JvThrow (env->ex);
} }
#endif /* INTERPRETER */ #endif /* INTERPRETER */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment