archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8228548: Normalize normalization for all

Browse source 
Reviewed-by: chegar, rhalade, igerasim
This commit is contained in:
Daniel Fuchs 2019-08-08 16:47:55 +01:00
parent 2215201dd5
commit 3375411e1b
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/net/URL.java
View file

@ -45,6 +45,7 @@ import java.util.ServiceLoader;
import jdk.internal.access.JavaNetURLAccess; import jdk.internal.access.JavaNetURLAccess;
import jdk.internal.access.SharedSecrets; import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.VM;
import sun.net.util.IPAddressUtil; import sun.net.util.IPAddressUtil;
import sun.security.util.SecurityConstants; import sun.security.util.SecurityConstants;
import sun.security.action.GetPropertyAction; import sun.security.action.GetPropertyAction;
@ -1431,7 +1432,7 @@ public final class URL implements java.io.Serializable {
boolean checkedWithFactory = false; boolean checkedWithFactory = false;
boolean overrideableProtocol = isOverrideable(protocol); boolean overrideableProtocol = isOverrideable(protocol);
if (overrideableProtocol && jdk.internal.misc.VM.isBooted()) { if (overrideableProtocol && VM.isBooted()) {
// Use the factory (if any). Volatile read makes // Use the factory (if any). Volatile read makes
// URLStreamHandlerFactory appear fully initialized to current thread. // URLStreamHandlerFactory appear fully initialized to current thread.
fac = factory; fac = factory;
@ -1665,7 +1666,9 @@ public final class URL implements java.io.Serializable {
} }
boolean isBuiltinStreamHandler(URLStreamHandler handler) { boolean isBuiltinStreamHandler(URLStreamHandler handler) {
return isBuiltinStreamHandler(handler.getClass().getName()); Class<?> handlerClass = handler.getClass();
return isBuiltinStreamHandler(handlerClass.getName())
|| VM.isSystemDomainLoader(handlerClass.getClassLoader());
} }
private boolean isBuiltinStreamHandler(String handlerClassName) { private boolean isBuiltinStreamHandler(String handlerClassName) {