test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp

rev 52233 : 8212884: Remove the assignments in ifs for vmTestbase/[a-s]
Summary:
Reviewed-by:

*** 92,103 ****
      JNINativeMethod nativeMethods[] = {
              {(char*) "setTagFor", (char*) "(Ljava/lang/Object;)Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_setTagFor},
              {(char*) "shutdownAgent", (char*) "()V", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_shutdownAgent}};
      jint nativeMethodsNumber = 2;
  
!     if (!NSK_JNI_VERIFY(jni, (appClass =
!         jni->FindClass(ATTACH021_TARGET_APP_CLASS_NAME)) != NULL)) {
          return NSK_FALSE;
      }
  
      if (!NSK_JNI_VERIFY(jni,
              (jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) {
--- 92,103 ----
      JNINativeMethod nativeMethods[] = {
              {(char*) "setTagFor", (char*) "(Ljava/lang/Object;)Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_setTagFor},
              {(char*) "shutdownAgent", (char*) "()V", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_shutdownAgent}};
      jint nativeMethodsNumber = 2;
  
!     appClass = jni->FindClass(ATTACH021_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))) {
*** 122,140 ****
  {
      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;
      }
--- 122,143 ----
  {
      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;
      }