--- a/src/hotspot/share/runtime/thread.cpp	Wed Feb 28 18:28:17 2018 +0000
+++ b/src/hotspot/share/runtime/thread.cpp	Thu Mar 01 01:47:46 2018 +0100
@@ -4218,6 +4218,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 && VMError::is_error_reported()) {
     os::infinite_sleep();