test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.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

*** 139,149 ****
      char *className;
      char *generic;
      jvmtiPhase phase;
  
  
!     if (!NSK_JNI_VERIFY(jni_env, (classObject = jni_env->GetObjectClass(thread)) != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
      if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(classObject, &className, &generic))) {
--- 139,150 ----
      char *className;
      char *generic;
      jvmtiPhase phase;
  
  
!     classObject = jni_env->GetObjectClass(thread);
!     if (!NSK_JNI_VERIFY(jni_env, classObject != NULL)) {
          nsk_jvmti_setFailStatus();
          return;
      }
  
      if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(classObject, &className, &generic))) {
*** 426,436 ****
          return JNI_ERR;
  
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
      classLoaderCount = nsk_jvmti_findOptionIntValue(CLASS_LOADER_COUNT_PARAM, 10);
  
!     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
          nsk_jvmti_setFailStatus();
          return JNI_ERR;
--- 427,438 ----
          return JNI_ERR;
  
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
      classLoaderCount = nsk_jvmti_findOptionIntValue(CLASS_LOADER_COUNT_PARAM, 10);
  
!     jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved);
!     if (!NSK_VERIFY(jvmti != NULL))
          return JNI_ERR;
  
      if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
          nsk_jvmti_setFailStatus();
          return JNI_ERR;