Skip to content

Commit 9a1fce0

Browse files
committed
8210726: Fix up a few minor nits forgotten by JDK-8210665
Minor changes to 4 tests to make one-liners Backport-of: fddc4b8
1 parent 6c6f9ef commit 9a1fce0

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,9 @@ Java_nsk_jvmti_SetFieldAccessWatch_setfldw005_getReady(JNIEnv *env, jclass cls)
154154

155155
for (i = 0; i < sizeof(fields) / sizeof(field); i++) {
156156
if (fields[i].stat == JNI_TRUE) {
157-
fields[i].fid = env-> GetStaticFieldID(
158-
cls, fields[i].name, fields[i].sig);
157+
fields[i].fid = env->GetStaticFieldID(cls, fields[i].name, fields[i].sig);
159158
} else {
160-
fields[i].fid = env->GetFieldID(
161-
cls, fields[i].name, fields[i].sig);
159+
fields[i].fid = env->GetFieldID(cls, fields[i].name, fields[i].sig);
162160
}
163161
if (fields[i].fid == NULL) {
164162
printf("Unable to set access watch on %s fld%" PRIuPTR ", fieldID=0",

test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,9 @@ Java_nsk_jvmti_SetFieldAccessWatch_setfldw006_getReady(JNIEnv *env,
176176
}
177177
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
178178
if (watches[i].is_static == JNI_TRUE) {
179-
watches[i].fid = env->GetStaticFieldID(
180-
cls, watches[i].f_name, watches[i].f_sig);
179+
watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
181180
} else {
182-
watches[i].fid = env->GetFieldID(
183-
cls, watches[i].f_name, watches[i].f_sig);
181+
watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
184182
}
185183
err = jvmti->SetFieldAccessWatch(cls, watches[i].fid);
186184
if (err == JVMTI_ERROR_NONE) {

test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,9 @@ Java_nsk_jvmti_SetFieldModificationWatch_setfmodw006_getReady(JNIEnv *env,
170170
}
171171
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
172172
if (watches[i].is_static == JNI_TRUE) {
173-
watches[i].fid = env->GetStaticFieldID(
174-
cls, watches[i].f_name, watches[i].f_sig);
173+
watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
175174
} else {
176-
watches[i].fid = env->GetFieldID(
177-
cls, watches[i].f_name, watches[i].f_sig);
175+
watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
178176
}
179177
err = jvmti->SetFieldModificationWatch(cls, watches[i].fid);
180178
if (err == JVMTI_ERROR_NONE) {

test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ Java_nsk_jvmti_SetLocalVariable_setlocal002_check(JNIEnv *env, jclass cls, jthre
108108
return result;
109109
}
110110

111-
mid = env->GetStaticMethodID(
112-
cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
111+
mid = env->GetStaticMethodID(cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
113112
if (mid == NULL) {
114113
printf("Cannot find method \"run\"\n");
115114
return STATUS_FAILED;

0 commit comments

Comments
 (0)