Attempt to reload the library in case of UnsatisfiedLinkError

When an UnsatisfiedLinkError is thrown because the library was already loaded in another classloader, run gc() to unload the unreachable classloaders, and reload the library again. Signed-off-by: Jason Feng <[email protected]>
eclipse-openj9 · Sep 30, 2024 · 19ff2a3 · 19ff2a3
1 parent ef7bb17
commit 19ff2a3
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/System.java b/jcl/src/java.base/share/classes/java/lang/System.java
@@ -1151,11 +1151,24 @@ public static void loadLibrary(String libName) {
 	if (smngr != null) {
 		smngr.checkLink(libName);
 	}
+	try {
+/*[IF JAVA_SPEC_VERSION >= 15]*/
+		ClassLoader.loadLibrary(getCallerClass(), libName);
+/*[ELSE]*/
+		ClassLoader.loadLibraryWithClassLoader(libName, ClassLoader.callerClassLoader());
+/*[ENDIF] JAVA_SPEC_VERSION >= 15 */
+	} catch (UnsatisfiedLinkError ule) {
+		String errorMessage = ule.getMessage();
+		if ((errorMessage != null) && errorMessage.contains("already loaded in another classloader")) { //$NON-NLS-1$
+			// attempt to unload the classloader, and retry
+			gc();
 /*[IF JAVA_SPEC_VERSION >= 15]*/
-	ClassLoader.loadLibrary(getCallerClass(), libName);
+			ClassLoader.loadLibrary(getCallerClass(), libName);
 /*[ELSE]*/
-	ClassLoader.loadLibraryWithClassLoader(libName, ClassLoader.callerClassLoader());
+			ClassLoader.loadLibraryWithClassLoader(libName, ClassLoader.callerClassLoader());
 /*[ENDIF] JAVA_SPEC_VERSION >= 15 */
+		}
+	}
 }
 
 /**