You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/08/03 16:08:24 UTC
svn commit: r562472 -
/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
Author: gshimansky
Date: Fri Aug 3 07:08:23 2007
New Revision: 562472
URL: http://svn.apache.org/viewvc?view=rev&rev=562472
Log:
Applied patch from HARMONY-4338
[drlvm][jvmti] JNI function NewStringUTF() invoked from Exception callback throws assertion `!is_unwindable()'
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?view=diff&rev=562472&r1=562471&r2=562472
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Fri Aug 3 07:08:23 2007
@@ -1413,9 +1413,9 @@
jvmtiEventException func =
(jvmtiEventException)ti_env->get_event_callback(JVMTI_EVENT_EXCEPTION);
if (NULL != func) {
-
tmn_suspend_enable();
assert(hythread_is_suspend_enabled());
+ BEGIN_RAISE_AREA;
func((jvmtiEnv *)ti_env, jni_env,
reinterpret_cast<jthread>(hThread),
@@ -1423,6 +1423,8 @@
location, exn_object,
reinterpret_cast<jmethodID>(catch_method),
catch_location);
+
+ END_RAISE_AREA;
tmn_suspend_disable();
}
ti_env = next_env;