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

[gs...@apache.org]

Author: gshimansky
Date: Fri Dec  8 15:58:00 2006
New Revision: 484853

URL: http://svn.apache.org/viewvc?view=rev&rev=484853
Log:
Applied HARMONY-2392 [drlvm][jvmti] Breakpoints refer to deleted methods when deleting Global_Env

Tests passed on WindowsXP, Ubuntu6 and Gentoo x86_64


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=484853&r1=484852&r2=484853
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Fri Dec  8 15:58:00 2006
@@ -1937,11 +1937,18 @@
     
     if (ti->is_single_step_enabled())
     {
-        // Stop single step and remove all breakpoints if there were some
+        // Stop single step and remove all step breakpoints if there were some
         jvmtiError errorCode = ti->jvmti_single_step_stop();
         assert(JVMTI_ERROR_NONE == errorCode);
     }
     
+    // Remove all other breakpoints
+    for (ti_env = ti->getEnvironments(); ti_env; ti_env = ti_env->next)
+    {
+        if (ti_env->brpt_intf)
+            ti_env->brpt_intf->remove_all_reference();
+    }
+
     ti->nextPhase(JVMTI_PHASE_DEAD);
 }