test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp

rev 52050 : [mq]: refactor

*** 50,72 ****
      return JNI_VERSION_1_8;
  }
  #endif
  jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) {
      nsk_printf(" Agent:: VM Started.\n");
!     if ( ! NSK_VERIFY ( JNI_OK == NSK_CPP_STUB3(GetEnv, vm,
!                     (void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf(" Agent ::Agent failed to get jvmti env.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          if (nsk_jvmti_parseOptions(options) == NSK_FALSE ) {
              nsk_printf(" Agent:: ## error agent Failed to parse options.\n");
              return JNI_ERR;
          }
          memset(&caps, 0, sizeof(caps));
          caps.can_redefine_classes = 1;
!         if ( ! NSK_JVMTI_VERIFY ( NSK_CPP_STUB2(AddCapabilities, jvmti, &caps) ) ) {
              nsk_printf(" Agent:: Error occured while adding capabilities.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
--- 50,71 ----
      return JNI_VERSION_1_8;
  }
  #endif
  jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) {
      nsk_printf(" Agent:: VM Started.\n");
!     if ( ! NSK_VERIFY ( JNI_OK == vm->GetEnv((void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf(" Agent ::Agent failed to get jvmti env.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          if (nsk_jvmti_parseOptions(options) == NSK_FALSE ) {
              nsk_printf(" Agent:: ## error agent Failed to parse options.\n");
              return JNI_ERR;
          }
          memset(&caps, 0, sizeof(caps));
          caps.can_redefine_classes = 1;
!         if ( ! NSK_JVMTI_VERIFY (jvmti->AddCapabilities(&caps) ) ) {
              nsk_printf(" Agent:: Error occured while adding capabilities.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
*** 83,93 ****
      char fileName[512];
      int redefineNumber ;
  
      redefineNumber=0;
      ret = JNI_FALSE;
!     if (!NSK_JNI_VERIFY(jni, (cls = NSK_CPP_STUB2(FindClass, jni, SEARCH_NAME)) != NULL)) {
          nsk_printf("Agent:: (*JNI)->FindClass(jni, %s) returns `null`.\n", SEARCH_NAME);
          return NSK_FALSE;
      }
      nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
                          sizeof(fileName)/sizeof(char));
--- 82,92 ----
      char fileName[512];
      int redefineNumber ;
  
      redefineNumber=0;
      ret = JNI_FALSE;
!     if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(SEARCH_NAME)) != NULL)) {
          nsk_printf("Agent:: (*JNI)->FindClass(jni, %s) returns `null`.\n", SEARCH_NAME);
          return NSK_FALSE;
      }
      nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
                          sizeof(fileName)/sizeof(char));