Mercurial > hg > truffle

diff src/share/vm/runtime/java.cpp @ 2302:da091bb67459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7022037: Pause when exiting if debugger is attached on windows Reviewed-by: dsamersoff, kamg, hosterda
author sla
date Mon, 28 Feb 2011 14:19:52 +0100
parents b92c45f2bc75
children 23ae54207126
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp	Sat Feb 26 13:33:23 2011 -0500
+++ b/src/share/vm/runtime/java.cpp	Mon Feb 28 14:19:52 2011 +0100
@@ -551,6 +551,7 @@
 
 void vm_direct_exit(int code) {
   notify_vm_shutdown();
+  os::wait_for_keypress_at_exit();
   ::exit(code);
 }
 
@@ -577,11 +578,13 @@
 void vm_shutdown()
 {
   vm_perform_shutdown_actions();
+  os::wait_for_keypress_at_exit();
   os::shutdown();
 }
 
 void vm_abort(bool dump_core) {
   vm_perform_shutdown_actions();
+  os::wait_for_keypress_at_exit();
   os::abort(dump_core);
   ShouldNotReachHere();
 }