# HG changeset patch
# User zgu
# Date 1372935808 25200
# Node ID a55aa67bce1a931ffc232aeba7f911a26bf67c91
# Parent  5f7a4367c78702f6e3917706bcac215d41ad96f1# Parent  f323bbb0e6c1208911c582fba71ad16f890c6108
Merge

diff -r 5f7a4367c787 -r a55aa67bce1a src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Thu Jul 04 06:24:08 2013 -0400
+++ b/src/share/vm/prims/jni.cpp	Thu Jul 04 04:03:28 2013 -0700
@@ -5097,7 +5097,7 @@
   // function used to determine this will always return false. Atomic::xchg
   // does not have this problem.
   if (Atomic::xchg(1, &vm_created) == 1) {
-    return JNI_ERR;   // already created, or create attempt in progress
+    return JNI_EEXIST;   // already created, or create attempt in progress
   }
   if (Atomic::xchg(0, &safe_to_recreate_vm) == 0) {
     return JNI_ERR;  // someone tried and failed and retry not allowed.