test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp

rev 52285 : 8212884: Remove the assignments in ifs for vmTestbase/[a-s]
Summary: Extract assignments from if statements in vmTestbase
Reviewed-by: cjplummer, sspitsyn

*** 113,123 ****
  }
  
  int startAuxiliaryThread(jvmtiEnv* jvmti, JNIEnv* jni) {
      jthread thread;
  
!     if (!NSK_VERIFY((thread = nsk_jvmti_aod_createThread(jni)) != NULL))
          return NSK_FALSE;
  
      if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY))) {
          return NSK_FALSE;
      }
--- 113,124 ----
  }
  
  int startAuxiliaryThread(jvmtiEnv* jvmti, JNIEnv* jni) {
      jthread thread;
  
!     thread = nsk_jvmti_aod_createThread(jni);
!     if (!NSK_VERIFY(thread != NULL))
          return NSK_FALSE;
  
      if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY))) {
          return NSK_FALSE;
      }
*** 143,161 ****
      jvmtiEnv* jvmti;
      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_JVMTI_VERIFY(jvmti->CreateRawMonitor("GCFinishMonitor", &gcFinishMonitor))) {
          return JNI_ERR;
      }
--- 144,165 ----
      jvmtiEnv* jvmti;
      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_JVMTI_VERIFY(jvmti->CreateRawMonitor("GCFinishMonitor", &gcFinishMonitor))) {
          return JNI_ERR;
      }