< prev index next >
test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp
Print this page
rev 52285 : 8212884: Remove the assignments in ifs for vmTestbase/[a-s]
Summary: Extract assignments from if statements in vmTestbase
Reviewed-by: cjplummer, sspitsyn
*** 102,113 ****
JNINativeMethod nativeMethods[] = {
{(char*)"shutdownAgent", (char*)"(I)Z",
(void*) Java_nsk_jvmti_AttachOnDemand_attach022_attach022Target_shutdownAgent}};
jint nativeMethodsNumber = 1;
! if (!NSK_JNI_VERIFY(jni, (appClass =
! jni->FindClass(ATTACH022_TARGET_APP_CLASS_NAME)) != NULL)) {
return NSK_FALSE;
}
if (!NSK_JNI_VERIFY(jni,
(jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) {
--- 102,113 ----
JNINativeMethod nativeMethods[] = {
{(char*)"shutdownAgent", (char*)"(I)Z",
(void*) Java_nsk_jvmti_AttachOnDemand_attach022_attach022Target_shutdownAgent}};
jint nativeMethodsNumber = 1;
! appClass = jni->FindClass(ATTACH022_TARGET_APP_CLASS_NAME);
! if (!NSK_JNI_VERIFY(jni, appClass != NULL)) {
return NSK_FALSE;
}
if (!NSK_JNI_VERIFY(jni,
(jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) {
*** 174,192 ****
{
jvmtiEventCallbacks eventCallbacks;
jvmtiCapabilities caps;
JNIEnv* jni;
! if (!NSK_VERIFY((options = (Options*) nsk_aod_createOptions(optionsString)) != NULL))
return JNI_ERR;
agentName = nsk_aod_getOptionValue(options, NSK_AOD_AGENT_NAME_OPTION);
! if ((jni = (JNIEnv*) nsk_aod_createJNIEnv(vm)) == NULL)
return JNI_ERR;
! if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
return JNI_ERR;
if (!NSK_VERIFY(registerNativeMethods(jni))) {
return JNI_ERR;
}
--- 174,195 ----
{
jvmtiEventCallbacks eventCallbacks;
jvmtiCapabilities caps;
JNIEnv* jni;
! options = (Options*) nsk_aod_createOptions(optionsString);
! if (!NSK_VERIFY(options != NULL))
return JNI_ERR;
agentName = nsk_aod_getOptionValue(options, NSK_AOD_AGENT_NAME_OPTION);
! jni = (JNIEnv*) nsk_aod_createJNIEnv(vm);
! if (jni == NULL)
return JNI_ERR;
! jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved);
! if (!NSK_VERIFY(jvmti != NULL))
return JNI_ERR;
if (!NSK_VERIFY(registerNativeMethods(jni))) {
return JNI_ERR;
}
< prev index next >