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

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2022-06-27 18:25:53 +00:00
commit d4b040f42d
24 changed files with 325 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
View file

@ -458,7 +458,11 @@ public final class ImageReader implements AutoCloseable {
makeDirectories(path);
} else { // a resource
makeDirectories(childloc.buildName(true, true, false));
newResource(dir, childloc);
// if we have already created a resource for this name previously, then don't
// recreate it
if (!nodes.containsKey(childloc.getFullName(true))) {
newResource(dir, childloc);
}
}
});
dir.setCompleted(true);
@ -753,6 +757,7 @@ public final class ImageReader implements AutoCloseable {
}
void addChild(Node node) {
assert !children.contains(node) : "Child " + node + " already added";
children.add(node);
}