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

…ber of class unload events: expected 10 got 4 Backport-of: c5e0464098f8f7cd9c568c7b1c3a06139453eaab
openjdk · Oct 28, 2022 · aa98d09 · aa98d09 · openjdk-notifier · Oct 28, 2022
1 parent 9732004
commit aa98d09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -730,6 +730,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)) {

diff --git a/test/jdk/com/sun/jdi/ClassUnloadEventTest.java b/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");
     }