infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-09 21:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8175385: ServiceLoader$LazyClassPathLookupIterator scans boot and platform modules for services

Browse Source 
Reviewed-by: alanb, mchung
This commit is contained in:
Claes Redestad 2017-02-28 12:24:29 +01:00
parent 8954402917
commit 3f32f64ee8
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/java.base/share/classes/java/util/ServiceLoader.java
View File

@ -48,6 +48,7 @@ import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import jdk.internal.loader.BootLoader;
import jdk.internal.loader.ClassLoaders;
import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.JavaLangReflectModuleAccess;
import jdk.internal.misc.SharedSecrets;
@ -1076,10 +1077,19 @@ public final class ServiceLoader<S>
if (configs == null) {
try {
String fullName = PREFIX + service.getName();
if (loader == null)
if (loader == null) {
configs = ClassLoader.getSystemResources(fullName);
else
} else if (loader == ClassLoaders.platformClassLoader()) {
// The platform classloader doesn't have a class path,
// but the boot loader might.
if (BootLoader.hasClassPath()) {
configs = BootLoader.findResources(fullName);
} else {
configs = Collections.emptyEnumeration();
}
} else {
configs = loader.getResources(fullName);
}
} catch (IOException x) {
fail(service, "Error locating configuration files", x);
}

8
jdk/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
View File

@ -187,6 +187,14 @@ public class BootLoader {
.map(name -> getDefinedPackage(name.replace('/', '.')));
}
/**
* Returns {@code true} if there is a class path associated with the
* BootLoader.
*/
public static boolean hasClassPath() {
return ClassLoaders.bootLoader().hasClassPath();
}
/**
* Helper class to define {@code Package} objects for packages in modules
* defined to the boot loader.

18
jdk/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
View File

@ -425,7 +425,7 @@ public class BuiltinClassLoader
* Returns a URL to a resource on the class path.
*/
private URL findResourceOnClassPath(String name) {
if (ucp != null) {
if (hasClassPath()) {
if (System.getSecurityManager() == null) {
return ucp.findResource(name, false);
} else {
@ -442,7 +442,7 @@ public class BuiltinClassLoader
* Returns the URLs of all resources of the given name on the class path.
*/
private Enumeration<URL> findResourcesOnClassPath(String name) {
if (ucp != null) {
if (hasClassPath()) {
if (System.getSecurityManager() == null) {
return ucp.findResources(name, false);
} else {
@ -481,7 +481,7 @@ public class BuiltinClassLoader
} else {
// search class path
if (ucp != null) {
if (hasClassPath()) {
c = findClassOnClassPathOrNull(cn);
}
@ -514,7 +514,7 @@ public class BuiltinClassLoader
}
// search class path
if (ucp != null) {
if (hasClassPath()) {
return findClassOnClassPathOrNull(cn);
}
@ -569,7 +569,7 @@ public class BuiltinClassLoader
}
// check class path
if (c == null && ucp != null && VM.isModuleSystemInited()) {
if (c == null && hasClassPath() && VM.isModuleSystemInited()) {
c = findClassOnClassPathOrNull(cn);
}
}
@ -869,6 +869,14 @@ public class BuiltinClassLoader
sealBase);
}
/**
* Returns {@code true} if there is a class path associated with this
* class loader.
*/
boolean hasClassPath() {
return ucp != null;
}
/**
* Returns {@code true} if the specified package name is sealed according to
* the given manifest.