diff -r 161ab90e3cae -r f066260954ae src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Mon Aug 26 16:37:09 2019 -0300
+++ b/src/share/vm/runtime/thread.cpp	Tue Feb 13 15:48:23 2018 +0100
@@ -4012,6 +4012,12 @@
                          Mutex::_as_suspend_equivalent_flag);
   }
 
+  EventShutdown e;
+  if (e.should_commit()) {
+    e.set_reason("No remaining non-daemon Java threads");
+    e.commit();
+  }
+
   // Hang forever on exit if we are reporting an error.
   if (ShowMessageBoxOnError && is_error_reported()) {
     os::infinite_sleep();