Merge pull request #22061 from tajila/jvmti

pshipton · web-flow · commit b22d681ce529 · 2025-06-09T10:42:35.000-04:00
(0.53) Fix add module read JNI return type
diff --git a/runtime/jvmti/jvmtiModules.c b/runtime/jvmti/jvmtiModules.c
@@ -398,7 +398,7 @@ jvmtiAddModuleReads(jvmtiEnv* jvmtiEnv, jobject fromModule, jobject toModule)
 
 				vm->addReads = addReads;
 			}
-			(*env)->CallObjectMethod(env, fromModule, vm->addReads, toModule, JNI_TRUE);
+			(*env)->CallVoidMethod(env, fromModule, vm->addReads, toModule, JNI_TRUE);
 			if ((*env)->ExceptionCheck(env)) {
 				rc = JVMTI_ERROR_INTERNAL;
 			}

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ jvmtiAddModuleReads(jvmtiEnv* jvmtiEnv, jobject fromModule, jobject toModule)`
`398`	`398`
`399`	`399`	`vm->addReads = addReads;`
`400`	`400`	`}`
`401`		`- (*env)->CallObjectMethod(env, fromModule, vm->addReads, toModule, JNI_TRUE);`
	`401`	`+ (*env)->CallVoidMethod(env, fromModule, vm->addReads, toModule, JNI_TRUE);`
`402`	`402`	`if ((*env)->ExceptionCheck(env)) {`
`403`	`403`	`rc = JVMTI_ERROR_INTERNAL;`
`404`	`404`	`}`