infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-01 11:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8075139: Restore java.protocol.handler.pkgs to work as a fallback for migration

Browse Source 
Reviewed-by: alanb, psandoz
This commit is contained in:
Chris Hegarty 2015-04-21 14:23:58 +01:00
parent cf33d5c103
commit e028ed3a21
4 changed files with 223 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
jdk/src/java.base/share/classes/java/net/URL.java
View File

@ -268,6 +268,23 @@ public final class URL implements java.io.Serializable {
* createURLStreamHandler} method of each provider, if instantiated, is
* invoked, with the protocol string, until a provider returns non-null,
* or all providers have been exhausted.
* <li>If the previous step fails to find a protocol handler, the
* constructor reads the value of the system property:
* <blockquote>{@code
* java.protocol.handler.pkgs
* }</blockquote>
* If the value of that system property is not {@code null},
* it is interpreted as a list of packages separated by a vertical
* slash character '{@code |}'. The constructor tries to load
* the class named:
* <blockquote>{@code
* <package>.<protocol>.Handler
* }</blockquote>
* where {@code <package>} is replaced by the name of the package
* and {@code <protocol>} is replaced by the name of the protocol.
* If this class does not exist, or if the class exists but it is not
* a subclass of {@code URLStreamHandler}, then the next package
* in the list is tried.
* <li>If the previous step fails to find a protocol handler, then the
* constructor tries to load a built-in protocol handler.
* If this class does not exist, or if the class exists but it is not a
@ -1139,6 +1156,39 @@ public final class URL implements java.io.Serializable {
}
}
private static URLStreamHandler lookupViaProperty(String protocol) {
String packagePrefixList = java.security.AccessController.doPrivileged(
new PrivilegedAction<String>() {
public String run() {
return System.getProperty(protocolPathProp, "");
}
});
String[] packagePrefixes = packagePrefixList.split("\\|");
URLStreamHandler handler = null;
for (int i=0; handler == null && i<packagePrefixes.length; i++) {
String packagePrefix = packagePrefixes[i].trim();
try {
String clsName = packagePrefix + "." + protocol + ".Handler";
Class<?> cls = null;
try {
cls = Class.forName(clsName);
} catch (ClassNotFoundException e) {
ClassLoader cl = ClassLoader.getSystemClassLoader();
if (cl != null) {
cls = cl.loadClass(clsName);
}
}
if (cls != null) {
handler = (URLStreamHandler)cls.newInstance();
}
} catch (Exception e) {
// any number of exceptions can get thrown here
}
}
return handler;
}
private static Iterator<URLStreamHandlerProvider> providers() {
return new Iterator<URLStreamHandlerProvider>() {
@ -1251,6 +1301,10 @@ public final class URL implements java.io.Serializable {
if (handler == null && !protocol.equalsIgnoreCase("jar")) {
handler = lookupViaProviders(protocol);
}
if (handler == null) {
handler = lookupViaProperty(protocol);
}
}
synchronized (streamHandlerLock) {

95
jdk/test/java/net/URL/HandlersPkgPrefix/HandlersPkgPrefix.java Normal file
View File

@ -0,0 +1,95 @@
/*
* Copyright (c) 2015, 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.
*
* 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.
*/
import java.net.MalformedURLException;
import java.net.URL;
import java.util.function.Consumer;
/*
* @test
* @bug 8075139
* @summary Basic test for java.protocol.handler.pkgs
* @compile handlers/foo/Handler.java handlers/bar/Handler.java HandlersPkgPrefix.java
* @run main/othervm HandlersPkgPrefix
*/
public class HandlersPkgPrefix {
static final Consumer<Result> KNOWN = r -> {
if (r.exception != null)
throw new RuntimeException("Unexpected exception " + r.exception);
String p = r.url.getProtocol();
if (!r.protocol.equals(p))
throw new RuntimeException("Expected:" + r.protocol + ", got:" + p);
};
static final Consumer<Result> UNKNOWN = r -> {
if (r.url != null)
throw new RuntimeException("Unexpected url:" + r.url);
if (!(r.exception instanceof MalformedURLException))
throw new RuntimeException("Expected MalformedURLException, got:"
+ r.exception);
};
public static void main(String[] args) {
withPrefix("unknown", "", UNKNOWN);
withPrefix("unknown", "handlers", UNKNOWN);
withPrefix("foo", "", UNKNOWN);
withPrefix("foo", "xxx|yyy|zzz", UNKNOWN);
withPrefix("foo", "||||", UNKNOWN);
withPrefix("foo", "|a|b|c|handlers", KNOWN);
withPrefix("bar", "", UNKNOWN);
withPrefix("bar", "x.y.z|y.y.y|z.z.z", UNKNOWN);
withPrefix("bar", " x.y.z | y.y.y | z.z.z| | ", UNKNOWN);
withPrefix("bar", "| a | b | c | handlers | d | e", KNOWN);
}
static void withPrefix(String protocol, String pkgPrefix,
Consumer<Result> resultChecker) {
System.out.println("Testing, " + protocol + ", " + pkgPrefix);
// The long standing implementation behavior is that the
// property is read multiple times, not cached.
System.setProperty("java.protocol.handler.pkgs", pkgPrefix);
URL url = null;
Exception exception = null;
try {
url = new URL(protocol + "://");
} catch (MalformedURLException x) {
exception = x;
}
resultChecker.accept(new Result(protocol, url, exception));
}
static class Result {
final String protocol;
final URL url;
final Exception exception;
Result(String protocol, URL url, Exception exception) {
this.protocol = protocol;
this.url = url;
this.exception = exception;
}
}
}

37
jdk/test/java/net/URL/HandlersPkgPrefix/handlers/bar/Handler.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2015, 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.
*
* 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 handlers.bar;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
public class Handler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
return null;
}
}

37
jdk/test/java/net/URL/HandlersPkgPrefix/handlers/foo/Handler.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2015, 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.
*
* 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 handlers.foo;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
public class Handler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
return null;
}
}