Kaydet (Commit) a76261ac authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#74683: java.lang.System.mapLibraryName dylib vs. jnilib confusion

Change-Id: I8fd7b908613a90c983f2244383432dd50ba10cdb
üst c4ecc15b
......@@ -44,8 +44,18 @@ final class NativeLibraries {
} catch (UnsatisfiedLinkError e) {
ClassLoader cl = NativeLibraries.class.getClassLoader();
if (cl instanceof URLClassLoader) {
URL url = ((URLClassLoader) cl).findResource(
System.mapLibraryName(libname));
String sysname = System.mapLibraryName(libname);
// At least Oracle's 1.7.0_51 now maps to .dylib rather than
// .jnilib:
if (System.getProperty("os.name").startsWith("Mac")
&& sysname.endsWith(".dylib"))
{
sysname
= sysname.substring(
0, sysname.length() - "dylib".length())
+ "jnilib";
}
URL url = ((URLClassLoader) cl).findResource(sysname);
if (url != null) {
try {
System.load(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment