src/share/vm/runtime/java.cpp

rev 2110 : [mq]: is-debugger-present

@@ -549,10 +549,11 @@
   HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
 }
 
 void vm_direct_exit(int code) {
   notify_vm_shutdown();
+  os::check_for_debugger_and_wait();
   ::exit(code);
 }
 
 void vm_perform_shutdown_actions() {
   // Warning: do not call 'exit_globals()' here. All threads are still running.

@@ -575,15 +576,17 @@
 }
 
 void vm_shutdown()
 {
   vm_perform_shutdown_actions();
+  os::check_for_debugger_and_wait();
   os::shutdown();
 }
 
 void vm_abort(bool dump_core) {
   vm_perform_shutdown_actions();
+  os::check_for_debugger_and_wait();
   os::abort(dump_core);
   ShouldNotReachHere();
 }
 
 void vm_notify_during_shutdown(const char* error, const char* message) {