test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp

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

@@ -457,19 +457,20 @@
 
 
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    if (!NSK_JNI_VERIFY(agentJNI, (cls = agentJNI->FindClass(CLASS_NAME)) != NULL))
+    cls = agentJNI->FindClass(CLASS_NAME);
+    if (!NSK_JNI_VERIFY(agentJNI, cls != NULL))
         return;
 
-    if (!NSK_JNI_VERIFY(agentJNI, (field_accID =
-            agentJNI->GetStaticFieldID(cls, FIELD_ACC_NAME, "I")) != NULL))
+    field_accID = agentJNI->GetStaticFieldID(cls, FIELD_ACC_NAME, "I");
+    if (!NSK_JNI_VERIFY(agentJNI, field_accID != NULL))
         return;
 
-    if (!NSK_JNI_VERIFY(agentJNI, (field_modID =
-            agentJNI->GetStaticFieldID(cls, FIELD_MOD_NAME, "I")) != NULL))
+    field_modID = agentJNI->GetStaticFieldID(cls, FIELD_MOD_NAME, "I");
+    if (!NSK_JNI_VERIFY(agentJNI, field_modID != NULL))
         return;
 
     if (!NSK_JVMTI_VERIFY(jvmti->SetFieldModificationWatch(cls, field_modID)))
         return;
 

@@ -519,11 +520,12 @@
     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))
+    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;