test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp

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

*** 95,111 ****
      NSK_DISPLAY0("Wait for debuggee to set classes to be redefined nsk_jvmti_waitForSync#4\n");
      if (!nsk_jvmti_waitForSync(timeout))
          return;
  
      NSK_DISPLAY1("Find class: %s\n", TESTED_CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, (classDef.klass = jni->FindClass(TESTED_CLASS_NAME)) != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
!     if (!NSK_JNI_VERIFY(jni, (classDef.klass = (jclass)
!             jni->NewGlobalRef(classDef.klass)) != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
      NSK_DISPLAY0("Redfine class with new byte code\n");
--- 95,112 ----
      NSK_DISPLAY0("Wait for debuggee to set classes to be redefined nsk_jvmti_waitForSync#4\n");
      if (!nsk_jvmti_waitForSync(timeout))
          return;
  
      NSK_DISPLAY1("Find class: %s\n", TESTED_CLASS_NAME);
!     classDef.klass = jni->FindClass(TESTED_CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, classDef.klass != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
!     classDef.klass = (jclass) jni->NewGlobalRef(classDef.klass);
!     if (!NSK_JNI_VERIFY(jni, classDef.klass != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
      NSK_DISPLAY0("Redfine class with new byte code\n");
*** 148,158 ****
      if (!NSK_VERIFY(nsk_jvmti_parseOptions(options)))
          return JNI_ERR;
  
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
  
!     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      {
          jvmtiCapabilities caps;
          memset(&caps, 0, sizeof(caps));
--- 149,160 ----
      if (!NSK_VERIFY(nsk_jvmti_parseOptions(options)))
          return JNI_ERR;
  
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
  
!     jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved);
!     if (!NSK_VERIFY(jvmti != NULL))
          return JNI_ERR;
  
      {
          jvmtiCapabilities caps;
          memset(&caps, 0, sizeof(caps));