test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp

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

*** 107,125 ****
      jvmtiEventCallbacks eventCallbacks;
      jvmtiCapabilities caps;
      jvmtiEnv* jvmti;
      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;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_monitor_events = 1;
      if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
--- 107,128 ----
      jvmtiEventCallbacks eventCallbacks;
      jvmtiCapabilities caps;
      jvmtiEnv* jvmti;
      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;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_monitor_events = 1;
      if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {