Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 5209:6bc860cd5ccf
7134701: [macosx] Support legacy native library names
Reviewed-by: alanb, skovatch, jmelvin
author | michaelm |
---|---|
date | Wed, 04 Apr 2012 23:15:58 +0100 |
parents | 68961e0a6ea4 |
children | 40084a75a36f |
files | make/java/java/FILES_java.gmk src/macosx/classes/java/lang/ClassLoaderHelper.java src/share/classes/java/lang/ClassLoader.java src/solaris/classes/java/lang/ClassLoaderHelper.java src/windows/classes/java/lang/ClassLoaderHelper.java |
diffstat | 5 files changed, 143 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/java/FILES_java.gmk Wed Apr 04 12:45:03 2012 -0400 +++ b/make/java/java/FILES_java.gmk Wed Apr 04 23:15:58 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/src/macosx/classes/java/lang/ClassLoaderHelper.java Wed Apr 04 23:15:58 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.toLowerCase().lastIndexOf(".dylib"); + if (index < 0) { + return null; + } + return new File(name.substring(0, index) + ".jnilib"); + } +}
--- a/src/share/classes/java/lang/ClassLoader.java Wed Apr 04 12:45:03 2012 -0400 +++ b/src/share/classes/java/lang/ClassLoader.java Wed Apr 04 23:15:58 2012 +0100 @@ -1861,6 +1861,17 @@ } private static boolean loadLibrary0(Class fromClass, final File file) { + if (loadLibrary1(fromClass, file)) { + return true; + } + final File libfile = ClassLoaderHelper.mapAlternativeName(file); + if (libfile != null && loadLibrary1(fromClass, libfile)) { + return true; + } + return false; + } + + private static boolean loadLibrary1(Class fromClass, final File file) { boolean exists = AccessController.doPrivileged( new PrivilegedAction<Object>() { public Object run() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/java/lang/ClassLoaderHelper.java Wed Apr 04 23:15:58 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/src/windows/classes/java/lang/ClassLoaderHelper.java Wed Apr 04 23:15:58 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; + } +}