From 468f74a1a8b3046ad6b6d6a906aefe42d5302205 Mon Sep 17 00:00:00 2001
From: Sangheon Kim <sangheki@openjdk.org>
Date: Mon, 26 Oct 2015 08:34:25 -0700
Subject: [PATCH] 8139801: Error message from validation check has wrong order
 on Windows

Added flushing stdout and stderr before exit or abort

Reviewed-by: coleenp, cjplummer
---
 hotspot/src/share/vm/prims/jni.cpp    | 4 ++++
 hotspot/src/share/vm/runtime/java.cpp | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 86b663240c8..9030b3fc9c2 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -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;
 
 }
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index d1d3d34adf7..35bb7684be8 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -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();
 }