< prev index next >
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
Print this page
rev 52233 : 8212884: Remove the assignments in ifs for vmTestbase/[a-s]
Summary:
Reviewed-by:
@@ -50,18 +50,19 @@
jobject o, jbyteArray byteCode) {
jbyte* elements;
jboolean isCopy;
- if (!NSK_JNI_VERIFY(jni_env, (newClassSize = jni_env->GetArrayLength(byteCode)) > 0)) {
+ newClassSize = jni_env->GetArrayLength(byteCode);
+ if (!NSK_JNI_VERIFY(jni_env, newClassSize > 0)) {
nsk_jvmti_setFailStatus();
return NSK_FALSE;
}
NSK_DISPLAY1("\t... got array size: %d\n", newClassSize);
- if (!NSK_JNI_VERIFY(jni_env, (elements =
- jni_env->GetByteArrayElements(byteCode, &isCopy)) != NULL)) {
+ elements = jni_env->GetByteArrayElements(byteCode, &isCopy);
+ if (!NSK_JNI_VERIFY(jni_env, elements != NULL)) {
nsk_jvmti_setFailStatus();
return NSK_FALSE;
}
NSK_DISPLAY1("\t... got elements list: 0x%p\n", (void*)elements);
@@ -92,12 +93,12 @@
*/
JNIEXPORT void JNICALL
Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t001_setClass(JNIEnv *jni_env,
jobject o, jclass cls) {
- if (!NSK_JNI_VERIFY(jni_env, (oldClassDef.klass = (jclass)
- jni_env->NewGlobalRef(cls)) != NULL)) {
+ oldClassDef.klass = (jclass) jni_env->NewGlobalRef(cls);
+ if (!NSK_JNI_VERIFY(jni_env, oldClassDef.klass != NULL)) {
nsk_jvmti_setFailStatus();
}
}
/* ============================================================================= */
@@ -240,11 +241,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;
{
jvmtiCapabilities caps;
memset(&caps, 0, sizeof(caps));
< prev index next >