--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp	Wed Nov 21 18:44:11 2018 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp	Wed Nov 21 10:46:45 2018 -0800
@@ -106,7 +106,8 @@
     jint res;
     jvmtiError err;
 
-    if ((res = vm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1)) != JNI_OK) {
+    res = vm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
+    if (res != JNI_OK) {
         printf("%s: Failed to call GetEnv: error=%d\n", __FILE__, res);
         return JNI_ERR;
     }
@@ -172,26 +173,27 @@
         return PASSED;
     }
 
-    if ((err = (jvmti->GetCurrentThread(&thread))) != JVMTI_ERROR_NONE) {
+    err = jvmti->GetCurrentThread(&thread);
+    if (err != JVMTI_ERROR_NONE) {
         printf("Failed to get current thread: %s (%d)\n", TranslateError(err), err);
         result = STATUS_FAILED;
         return STATUS_FAILED;
     }
 
-    if ((err = (jvmti->SetEventNotificationMode(JVMTI_ENABLE,
-             JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) != JVMTI_ERROR_NONE) {
+    err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL);
+    if (err != JVMTI_ERROR_NONE) {
         printf("Failed to enable event JVMTI_EVENT_CLASS_FILE_LOAD_HOOK: %s (%d)\n",
                TranslateError(err), err);
         result = STATUS_FAILED;
     }
-    if ((err = (jvmti->SetEventNotificationMode(JVMTI_ENABLE,
-             JVMTI_EVENT_CLASS_LOAD, thread))) != JVMTI_ERROR_NONE) {
+    err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread);
+    if (err != JVMTI_ERROR_NONE) {
         printf("Failed to enable event JVMTI_EVENT_CLASS_LOAD: %s (%d)\n",
                TranslateError(err), err);
         result = STATUS_FAILED;
     }
-    if ((err = jvmti->SetEventNotificationMode(JVMTI_ENABLE,
-            JVMTI_EVENT_CLASS_PREPARE, thread)) != JVMTI_ERROR_NONE) {
+    err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, thread);
+    if (err != JVMTI_ERROR_NONE) {
         printf("Failed to enable JVMTI_EVENT_CLASS_PREPARE: %s (%d)\n",
                TranslateError(err), err);
         result = STATUS_FAILED;
@@ -207,7 +209,8 @@
     if (vrb == 1)
         printf(">>>>>>>> Invoke RedefineClasses():\n\tnew class byte count=%d\n",
             classDef.class_byte_count);
-    if ((err = (jvmti->RedefineClasses(1, &classDef))) != JVMTI_ERROR_NONE) {
+    err = jvmti->RedefineClasses(1, &classDef);
+    if (err != JVMTI_ERROR_NONE) {
         printf("TEST FAILED: the function RedefineClasses() returned error %d: %s\n",
             err, TranslateError(err));
         printf("\tFor more info about this error see the JVMTI spec.\n");