infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename expandedPath to manifestClassPath

Browse Source
This commit is contained in:
Eirik Bjorsnos 2026-01-26 14:35:47 +01:00
parent d79624429e
commit af9f50292f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
View File

@ -110,7 +110,7 @@ public class URLClassPath {
/* List of URLs found during expansion of JAR 'Class-Path' attributes
* Access is guarded by a monitor on 'searchPath'
*/
private final ArrayList<URL> expandedPath = new ArrayList<>();
private final ArrayList<URL> manifestClassPath = new ArrayList<>();
/* The resulting search path of Loaders */
private final ArrayList<Loader> loaders = new ArrayList<>();
@ -377,8 +377,8 @@ public class URLClassPath {
private URL nextURL() {
synchronized (searchPath) {
// Check paths discovered during 'Class-Path' expansion first
if (!expandedPath.isEmpty()) {
return expandedPath.removeLast();
if (!manifestClassPath.isEmpty()) {
return manifestClassPath.removeLast();
}
// Check the regular search path
if (nextURL < searchPath.size()) {
@ -430,7 +430,7 @@ public class URLClassPath {
continue;
}
if (loaderClassPathURLs != null) {
addExpandedPaths(loaderClassPathURLs);
addManifestClassPaths(loaderClassPathURLs);
}
// Finally, add the Loader to the search path.
loaders.add(loader);
@ -485,10 +485,10 @@ public class URLClassPath {
/*
* Adds the specified URLs to the list of 'Class-Path' expanded URLs
*/
private void addExpandedPaths(URL[] urls) {
private void addManifestClassPaths(URL[] urls) {
synchronized (searchPath) {
// Adding in reversed order since expandedPath is consumed tail-first
expandedPath.addAll(Arrays.asList(urls).reversed());
// Adding in reversed order since manifestClassPath is consumed tail-first
manifestClassPath.addAll(Arrays.asList(urls).reversed());
}
}