diff options
| author | zgu <none@none> | 2013-07-04 04:03:28 -0700 |
|---|---|---|
| committer | zgu <none@none> | 2013-07-04 04:03:28 -0700 |
| commit | 634070f64c8589d76b6148e1fe3adfa4be799a69 (patch) | |
| tree | fbb2244e4aa07e51c806fce6f4d43ac8319d7fc4 /src/share/vm | |
| parent | 49ba5985cd8cbc143406703f96c2806319a11db9 (diff) | |
| parent | 00b730daccba17aae01857469af5a7788dd177b6 (diff) | |
Merge
Diffstat (limited to 'src/share/vm')
| -rw-r--r-- | src/share/vm/prims/jni.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp index f37ea34c4..42930ff74 100644 --- a/src/share/vm/prims/jni.cpp +++ b/src/share/vm/prims/jni.cpp @@ -5097,7 +5097,7 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_CreateJavaVM(JavaVM **vm, void **penv, v // 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. |