8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong num…

…ber of class unload events: expected 10 got 4

Reviewed-by: cjplummer, amenkov

src/hotspot/share/prims/jvmtiExport.cpp

@@ -719,6 +719,8 @@ void JvmtiExport::post_vm_initialized() {
 void JvmtiExport::post_vm_death() {
   EVT_TRIG_TRACE(JVMTI_EVENT_VM_DEATH, ("Trg VM death event triggered" ));
 
+  JvmtiTagMap::flush_all_object_free_events();
+
   JvmtiEnvIterator it;
   for (JvmtiEnv* env = it.first(); env != NULL; env = it.next(env)) {
     if (env->is_enabled(JVMTI_EVENT_VM_DEATH)) {

test/jdk/com/sun/jdi/ClassUnloadEventTest.java

@@ -117,13 +117,8 @@ private static void runDebuggee() {
         // Trigger class unloading
         ClassUnloadCommon.triggerUnloading();
 
-        // Do a short delay to make sure all ClassUnloadEvents have been sent
-        // before VMDeathEvent is generated.
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-        }
-
+        // We rely on JVMTI to post all pending ObjectFree events at VM shutdown.
+        // It will trigger the JDWP agent to synthesize expected ClassUnloadEvents events.
         System.out.println("Exiting debuggee");
     }