--- a/jdk/make/java/java/FILES_java.gmk Tue Mar 27 10:10:47 2012 -0700
+++ b/jdk/make/java/java/FILES_java.gmk Tue Mar 27 21:08:52 2012 +0100
@@ -51,6 +51,7 @@
java/lang/SuppressWarnings.java \
java/lang/AbstractStringBuilder.java \
java/lang/ClassLoader.java \
+ java/lang/ClassLoaderHelper.java \
java/lang/AssertionStatusDirectives.java \
java/lang/Enum.java \
java/lang/StrictMath.java \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java Tue Mar 27 21:08:52 2012 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+import java.io.File;
+
+class ClassLoaderHelper {
+
+ private ClassLoaderHelper() {}
+
+ /**
+ * Returns an alternate path name for the given file
+ * such that if the original pathname did not exist, then the
+ * file may be located at the alternate location.
+ * For mac, this replaces the final .dylib suffix with .jnilib
+ */
+ static File mapAlternativeName(File lib) {
+ String name = lib.toString();
+ int index = name.lastIndexOf('.');
+ if (index < 0) {
+ return null;
+ }
+ return new File(name.substring(0, index) + ".jnilib");
+ }
+}
--- a/jdk/src/share/classes/java/lang/ClassLoader.java Tue Mar 27 10:10:47 2012 -0700
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java Tue Mar 27 21:08:52 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1847,6 +1847,10 @@
if (loadLibrary0(fromClass, libfile)) {
return;
}
+ libfile = ClassLoaderHelper.mapAlternativeName(libfile);
+ if (libfile != null && loadLibrary0(fromClass, libfile)) {
+ return;
+ }
}
if (loader != null) {
for (int i = 0 ; i < usr_paths.length ; i++) {
@@ -1855,6 +1859,10 @@
if (loadLibrary0(fromClass, libfile)) {
return;
}
+ libfile = ClassLoaderHelper.mapAlternativeName(libfile);
+ if (libfile != null && loadLibrary0(fromClass, libfile)) {
+ return;
+ }
}
}
// Oops, it failed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java Tue Mar 27 21:08:52 2012 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+import java.io.File;
+
+class ClassLoaderHelper {
+
+ private ClassLoaderHelper() {}
+
+ /**
+ * Returns an alternate path name for the given file
+ * such that if the original pathname did not exist, then the
+ * file may be located at the alternate location.
+ * For most platforms, this behavior is not supported and returns null.
+ */
+ static File mapAlternativeName(File lib) {
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/windows/classes/java/lang/ClassLoaderHelper.java Tue Mar 27 21:08:52 2012 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+import java.io.File;
+
+class ClassLoaderHelper {
+
+ private ClassLoaderHelper() {}
+
+ /**
+ * Returns an alternate path name for the given file
+ * such that if the original pathname did not exist, then the
+ * file may be located at the alternate location.
+ * For most platforms, this behavior is not supported and returns null.
+ */
+ static File mapAlternativeName(File lib) {
+ return null;
+ }
+}