--- old/src/share/vm/runtime/java.cpp	2011-02-25 15:53:12.079590500 +0100
+++ new/src/share/vm/runtime/java.cpp	2011-02-25 15:53:11.654566200 +0100
@@ -551,6 +551,7 @@
 
 void vm_direct_exit(int code) {
   notify_vm_shutdown();
+  os::check_for_debugger_and_wait();
   ::exit(code);
 }
 
@@ -577,11 +578,13 @@
 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();
 }