--- a/hotspot/src/share/vm/prims/jni.cpp	Wed Oct 28 09:47:23 2015 -0400
+++ b/hotspot/src/share/vm/prims/jni.cpp	Wed Oct 28 15:03:40 2015 +0100
@@ -4061,6 +4061,10 @@
     OrderAccess::release_store(&vm_created, 0);
   }
 
+  // Flush stdout and stderr before exit.
+  fflush(stdout);
+  fflush(stderr);
+
   return result;
 
 }