infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-05 18:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Coleen Phillimore 2015-10-26 18:27:33 +01:00
commit 4995b2efde
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/share/vm/prims/jni.cpp
View File

@ -4061,6 +4061,10 @@ static jint JNI_CreateJavaVM_inner(JavaVM **vm, void **penv, void *args) {
OrderAccess::release_store(&vm_created, 0);
}
// Flush stdout and stderr before exit.
fflush(stdout);
fflush(stderr);
return result;
}

5
hotspot/src/share/vm/runtime/java.cpp
View File

@ -575,6 +575,11 @@ void vm_shutdown()
void vm_abort(bool dump_core) {
vm_perform_shutdown_actions();
os::wait_for_keypress_at_exit();
// Flush stdout and stderr before abort.
fflush(stdout);
fflush(stderr);
os::abort(dump_core);
ShouldNotReachHere();
}