8309171: Test vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java fails after JDK-8308341
Reviewed-by: dcubed, gziemski
This commit is contained in:
parent
f8a924a749
commit
0119969816
@ -3474,7 +3474,8 @@ extern const struct JNIInvokeInterface_ jni_InvokeInterface;
|
||||
// Global invocation API vars
|
||||
enum VM_Creation_State {
|
||||
NOT_CREATED = 0,
|
||||
IN_PROGRESS,
|
||||
IN_PROGRESS, // Most JNI operations are permitted during this phase to
|
||||
// allow for initialization actions by libraries and agents.
|
||||
COMPLETE
|
||||
};
|
||||
|
||||
@ -3694,7 +3695,7 @@ static jint JNICALL jni_DestroyJavaVM_inner(JavaVM *vm) {
|
||||
jint res = JNI_ERR;
|
||||
DT_RETURN_MARK(DestroyJavaVM, jint, (const jint&)res);
|
||||
|
||||
if (vm_created != COMPLETE) {
|
||||
if (vm_created == NOT_CREATED) {
|
||||
res = JNI_ERR;
|
||||
return res;
|
||||
}
|
||||
@ -3859,7 +3860,7 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
|
||||
|
||||
jint JNICALL jni_AttachCurrentThread(JavaVM *vm, void **penv, void *_args) {
|
||||
HOTSPOT_JNI_ATTACHCURRENTTHREAD_ENTRY(vm, penv, _args);
|
||||
if (vm_created != COMPLETE) {
|
||||
if (vm_created == NOT_CREATED) {
|
||||
// Not sure how we could possibly get here.
|
||||
HOTSPOT_JNI_ATTACHCURRENTTHREAD_RETURN((uint32_t) JNI_ERR);
|
||||
return JNI_ERR;
|
||||
@ -3873,7 +3874,7 @@ jint JNICALL jni_AttachCurrentThread(JavaVM *vm, void **penv, void *_args) {
|
||||
|
||||
jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
|
||||
HOTSPOT_JNI_DETACHCURRENTTHREAD_ENTRY(vm);
|
||||
if (vm_created != COMPLETE) {
|
||||
if (vm_created == NOT_CREATED) {
|
||||
// Not sure how we could possibly get here.
|
||||
HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(JNI_ERR);
|
||||
return JNI_ERR;
|
||||
@ -3937,9 +3938,6 @@ jint JNICALL jni_GetEnv(JavaVM *vm, void **penv, jint version) {
|
||||
jint ret = JNI_ERR;
|
||||
DT_RETURN_MARK(GetEnv, jint, (const jint&)ret);
|
||||
|
||||
// We can be called by native libraries in the JDK during VM
|
||||
// initialization, so only bail-out if something seems very wrong.
|
||||
// Though how would we get here in that case?
|
||||
if (vm_created == NOT_CREATED) {
|
||||
*penv = nullptr;
|
||||
ret = JNI_EDETACHED;
|
||||
@ -3991,9 +3989,9 @@ jint JNICALL jni_GetEnv(JavaVM *vm, void **penv, jint version) {
|
||||
|
||||
jint JNICALL jni_AttachCurrentThreadAsDaemon(JavaVM *vm, void **penv, void *_args) {
|
||||
HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_ENTRY(vm, penv, _args);
|
||||
if (vm_created != COMPLETE) {
|
||||
if (vm_created == NOT_CREATED) {
|
||||
// Not sure how we could possibly get here.
|
||||
HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN((uint32_t) JNI_ERR);
|
||||
HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN((uint32_t) JNI_ERR);
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
||||
|
@ -153,7 +153,7 @@ vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
|
||||
|
||||
vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/TestDescription.java 8307462 generic-all
|
||||
vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
|
||||
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652,8309171 generic-all
|
||||
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
|
||||
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
|
||||
vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
|
||||
vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
|
||||
|
Loading…
x
Reference in New Issue
Block a user