Merge
authorzgu
Thu, 04 Jul 2013 04:03:28 -0700
changeset 18682 694f6918ba42
parent 18681 c3f1b735c47f (current diff)
parent 18680 6d5dc445baec (diff)
child 18683 a6418e038255
Merge
--- a/hotspot/src/share/vm/prims/jni.cpp	Thu Jul 04 06:24:08 2013 -0400
+++ b/hotspot/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.