src/hotspot/share/runtime/java.cpp

*** 443,453 ****
    if (event.should_commit()) {
      event.set_thread(JFR_THREAD_ID(thread));
      event.commit();
    }
  
!   JFR_ONLY(Jfr::on_vm_shutdown();)
  
    // Stop the WatcherThread. We do this before disenrolling various
    // PeriodicTasks to reduce the likelihood of races.
    if (PeriodicTask::num_tasks() > 0) {
      WatcherThread::stop();
--- 443,453 ----
    if (event.should_commit()) {
      event.set_thread(JFR_THREAD_ID(thread));
      event.commit();
    }
  
!   JFR_ONLY(Jfr::on_vm_shutdown(thread);)
  
    // Stop the WatcherThread. We do this before disenrolling various
    // PeriodicTasks to reduce the likelihood of races.
    if (PeriodicTask::num_tasks() > 0) {
      WatcherThread::stop();