harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r598423 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
Date Mon, 26 Nov 2007 20:52:18 GMT
Author: gshimansky
Date: Mon Nov 26 12:52:17 2007
New Revision: 598423

URL: http://svn.apache.org/viewvc?rev=598423&view=rev
Log:
Applied patch from HARMONY-5188
[drlvm][jvmti] Failed VTSVM JVMTI tests IsInterfaceXXXX


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=598423&r1=598422&r2=598423&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 Nov 26 12:52:17 2007
@@ -471,29 +471,30 @@
     // Switch phase to VM_Start and sent VMStart event
     ti->nextPhase(JVMTI_PHASE_START);
 
-    if(!jvmti_should_report_event(JVMTI_EVENT_VM_START))
-        return;
-
-    // Send VM_Start TI events
-    TIEnv *ti_env = ti->getEnvironments();
-    TIEnv *next_env;
-    while (NULL != ti_env)
+    if(jvmti_should_report_event(JVMTI_EVENT_VM_START))
     {
-        next_env = ti_env->next;
-        if (ti_env->global_events[JVMTI_EVENT_VM_START - JVMTI_MIN_EVENT_TYPE_VAL])
+        // Send VM_Start TI events
+        TIEnv *ti_env = ti->getEnvironments();
+        TIEnv *next_env;
+        while (NULL != ti_env)
         {
-            jvmtiEventVMStart func = (jvmtiEventVMStart)ti_env->get_event_callback(JVMTI_EVENT_VM_START);
-            if (NULL != func)
+            next_env = ti_env->next;
+            if (ti_env->global_events[JVMTI_EVENT_VM_START - JVMTI_MIN_EVENT_TYPE_VAL])
             {
-                TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START called");
-                func((jvmtiEnv*)ti_env, jni_env);
-                TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START finished");
+                jvmtiEventVMStart func = (jvmtiEventVMStart)ti_env->get_event_callback(JVMTI_EVENT_VM_START);
+                if (NULL != func)
+                {
+                    TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START called");
+                    func((jvmtiEnv*)ti_env, jni_env);
+                    TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START finished");
+                }
             }
-        }
 
-        ti_env = next_env;
+            ti_env = next_env;
+        }
     }
-    // send notify events
+
+    // send pending notify events
     unsigned index;
     if(jvmti_should_report_event(JVMTI_EVENT_CLASS_LOAD)) {
         for( index = 0; index < env->TI->GetNumberPendingNotifyLoadClass(); index++
) {



Mime
View raw message