stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8222144: BuiltinClassLoader should create the CodeSource for jrt URLs lazily

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Claes Redestad 2019-04-09 11:40:01 +02:00
parent 8f556345e1
commit 9a97b54211
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@ import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.VM;
import jdk.internal.module.ModulePatcher.PatchedModuleReader;
import jdk.internal.module.Resources;
import jdk.internal.vm.annotation.Stable;
/**
@ -117,14 +118,18 @@ public class BuiltinClassLoader
private static class LoadedModule {
private final BuiltinClassLoader loader;
private final ModuleReference mref;
private final URL codeSourceURL; // may be null
private final URI uri; // may be null
private @Stable URL codeSourceURL; // may be null
LoadedModule(BuiltinClassLoader loader, ModuleReference mref) {
URL url = null;
if (mref.location().isPresent()) {
try {
url = mref.location().get().toURL();
} catch (MalformedURLException | IllegalArgumentException e) { }
this.uri = mref.location().orElse(null);
// for non-jrt schemes we need to resolve the codeSourceURL
// eagerly during bootstrap since the handler might be
// overridden
if (uri != null && !"jrt".equals(uri.getScheme())) {
url = createURL(uri);
}
this.loader = loader;
this.mref = mref;
@ -134,7 +139,23 @@ public class BuiltinClassLoader
BuiltinClassLoader loader() { return loader; }
ModuleReference mref() { return mref; }
String name() { return mref.descriptor().name(); }
URL codeSourceURL() { return codeSourceURL; }
URL codeSourceURL() {
URL url = codeSourceURL;
if (url == null && uri != null) {
codeSourceURL = url = createURL(uri);
}
return url;
}
private URL createURL(URI uri) {
URL url = null;
try {
url = uri.toURL();
} catch (MalformedURLException | IllegalArgumentException e) {
}
return url;
}
}