changeset 4929:a55aa67bce1a

Merge
author zgu
date Thu, 04 Jul 2013 04:03:28 -0700
parents 5f7a4367c787 f323bbb0e6c1
children 59b052799158
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.