test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp

rev 52050 : [mq]: refactor

*** 47,70 ****
  JNIEXPORT jint JNI_OnLoad_hs104t002(JavaVM *jvm, char *options, void *reserved) {
      return JNI_VERSION_1_8;
  }
  #endif
  jint  Agent_Initialize(JavaVM *vm, char *options, void *reserved){
!     if ( ! NSK_VERIFY ( JNI_OK == NSK_CPP_STUB3(GetEnv, vm,
!                     (void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf("#error Agent :: Could not load JVMTI interface.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          if (nsk_jvmti_parseOptions(options) == NSK_FALSE ) {
              nsk_printf("# 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("#error Agent :: occured while adding capabilities.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
--- 47,68 ----
  JNIEXPORT jint JNI_OnLoad_hs104t002(JavaVM *jvm, char *options, void *reserved) {
      return JNI_VERSION_1_8;
  }
  #endif
  jint  Agent_Initialize(JavaVM *vm, char *options, void *reserved){
!     if ( ! NSK_VERIFY ( JNI_OK == vm->GetEnv((void **)&jvmti, JVMTI_VERSION_1_1) ) ) {
          nsk_printf("#error Agent :: Could not load JVMTI interface.\n");
          return JNI_ERR;
      } else {
          jvmtiCapabilities caps;
          if (nsk_jvmti_parseOptions(options) == NSK_FALSE ) {
              nsk_printf("# 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("#error Agent :: occured while adding capabilities.\n");
              return JNI_ERR;
          }
      }
      return JNI_OK;
*** 74,85 ****
  Java_nsk_jvmti_scenarios_hotswap_HS104_hs104t002_hs104t002_redefineClasses(
      JNIEnv *jni, jclass classObject) {
      jclass cla;
      char fileName[512];
  
!     if ( ! NSK_JNI_VERIFY(jni, ( cla = NSK_CPP_STUB2(FindClass,
!                                 jni, SEARCH_NAME) ) != NULL ) ) {
          nsk_printf(" Agent :: Failed to get class.\n");
          nsk_jvmti_agentFailed();
          return;
      }
      nsk_jvmti_getFileName(0, FILE_NAME, fileName,
--- 72,82 ----
  Java_nsk_jvmti_scenarios_hotswap_HS104_hs104t002_hs104t002_redefineClasses(
      JNIEnv *jni, jclass classObject) {
      jclass cla;
      char fileName[512];
  
!     if ( ! NSK_JNI_VERIFY(jni, ( cla = jni->FindClass(SEARCH_NAME) ) != NULL ) ) {
          nsk_printf(" Agent :: Failed to get class.\n");
          nsk_jvmti_agentFailed();
          return;
      }
      nsk_jvmti_getFileName(0, FILE_NAME, fileName,