From e85cf1afc5e52498a06f400f64bd0f9c5c9444a6 Mon Sep 17 00:00:00 2001 From: Jason Katonica Date: Fri, 5 Jan 2024 08:51:25 -0500 Subject: [PATCH] Use correct JNI function to call ArrayList.add() Various testcases are being run as part of the `openj9` project. Currently one of these tests is failing since they are able to detect that the wrong method signature is being used by JNI calls at runtime. This update makes the same method call only it expects a boolean to be returned from the method call. This allows for the test to pass the JNI method signature check. This fixes [openj9 issue 17795](https://github.com/eclipse-openj9/openj9/issues/17795). Signed-off-by: Jason Katonica --- jdk/src/share/native/sun/security/pkcs11/j2secmod.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jdk/src/share/native/sun/security/pkcs11/j2secmod.c b/jdk/src/share/native/sun/security/pkcs11/j2secmod.c index 9321287300f..10eeef1eec9 100644 --- a/jdk/src/share/native/sun/security/pkcs11/j2secmod.c +++ b/jdk/src/share/native/sun/security/pkcs11/j2secmod.c @@ -23,6 +23,12 @@ * questions. */ +/* + * =========================================================================== + * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved + * =========================================================================== + */ + #include #include #include @@ -241,7 +247,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_Secmod_nssGetModuleList if (jModule == NULL) { return NULL; } - (*env)->CallVoidMethod(env, jList, jAdd, jModule); + (*env)->CallBooleanMethod(env, jList, jAdd, jModule); if ((*env)->ExceptionCheck(env)) { return NULL; }