test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp

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

*** 56,74 ****
      jvmtiEnv* jvmti;
      JNIEnv* jni = NULL;
      Options* options = NULL;
      const char* agentName;
  
!     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;
  
      NSK_DISPLAY1("%s: initialization was done\n", agentName);
  
      if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, agentName)))
--- 56,77 ----
      jvmtiEnv* jvmti;
      JNIEnv* jni = NULL;
      Options* options = NULL;
      const char* agentName;
  
!     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;
  
      NSK_DISPLAY1("%s: initialization was done\n", agentName);
  
      if (!NSK_VERIFY(nsk_aod_agentLoaded(jni, agentName)))