test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp

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

*** 49,59 ****
          jclass klass) {
      char className[MAX_STRING_LENGTH];
      const char* agentName;
      Options* options;
  
!     if (!NSK_VERIFY((options = nsk_jvmti_aod_getMultiagentsOptions(jvmti)) != NULL)) {
          NSK_COMPLAIN0("Failed to get agents's options\n");
          nsk_jvmti_aod_disableEvent(jvmti, JVMTI_EVENT_CLASS_LOAD);
          // can't call nsk_aod_agentFinished because of without options can't get agent's name
          return;
      }
--- 49,60 ----
          jclass klass) {
      char className[MAX_STRING_LENGTH];
      const char* agentName;
      Options* options;
  
!     options = nsk_jvmti_aod_getMultiagentsOptions(jvmti);
!     if (!NSK_VERIFY(options != NULL)) {
          NSK_COMPLAIN0("Failed to get agents's options\n");
          nsk_jvmti_aod_disableEvent(jvmti, JVMTI_EVENT_CLASS_LOAD);
          // can't call nsk_aod_agentFinished because of without options can't get agent's name
          return;
      }
*** 98,116 ****
      jvmtiEnv* jvmti = NULL;
      JNIEnv* jni = NULL;
      Options* options;
      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 NSK_FALSE;
  
!     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_redefine_classes = 1;
      if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
--- 99,120 ----
      jvmtiEnv* jvmti = NULL;
      JNIEnv* jni = NULL;
      Options* options;
      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 NSK_FALSE;
  
!     jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved);
!     if (!NSK_VERIFY(jvmti != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_redefine_classes = 1;
      if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {