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/09/17 18:15:47 UTC

svn commit: r576499 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp

Author: gshimansky
Date: Mon Sep 17 09:15:46 2007
New Revision: 576499

URL: http://svn.apache.org/viewvc?rev=576499&view=rev
Log:
Fix bug for HARMONY-4724
[drlvm][EUT] EUT 3.2 jdtdebug suite reports 'Program did not suspend'

When MethodExit and FramePopNotification both are disabled should we
disable method_exit flag for JIT.


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?rev=576499&r1=576498&r2=576499&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Mon Sep 17 09:15:46 2007
@@ -410,7 +410,7 @@
                 else if (JVMTI_DISABLE == mode && ti->get_method_exit_flag() != 0)
                 {
                     LMAutoUnlock lock(&ti->TIenvs_lock);
-                    bool disable = check_event_is_disable(JVMTI_EVENT_METHOD_EXIT, ti) ||
+                    bool disable = check_event_is_disable(JVMTI_EVENT_METHOD_EXIT, ti) &&
                         check_event_is_disable(JVMTI_EVENT_FRAME_POP, ti);
                     if (disable) {
                         TRACE2("jvmti.event.method.exit", "DISABLED global method exit flag");