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

8136365: Provider "jrt" is not available after bootmodules.jimage recreation

Browse Source 
META-INF content was lost during recreate.

Reviewed-by: jlaskey, sundar
This commit is contained in:
Jean-Francois Denise 2015-10-06 09:12:00 +02:00
parent f8dca18a53
commit 26d5d5d625
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jdk/src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java
View File

@ -261,6 +261,7 @@ public final class ImageFileCreator {
Map<String, List<Entry>> entriesForModule,
ByteOrder byteOrder) throws IOException {
ResourcePoolImpl resources = new ResourcePoolImpl(byteOrder);
// Doesn't contain META-INF
Set<String> mods = modulePackagesMap.keySet();
for (String mn : mods) {
for (Entry entry : entriesForModule.get(mn)) {
@ -286,6 +287,31 @@ public final class ImageFileCreator {
Archive archive = nameToArchive.get(mn);
archive.close();
}
// Fix for 8136365. Do we have an archive with module name "META-INF"?
// If yes, we are recreating a jimage.
// This is a workaround for META-INF being at the top level of resource path
String mn = "META-INF";
Archive archive = nameToArchive.get(mn);
if (archive != null) {
try {
for (Entry entry : entriesForModule.get(mn)) {
String path = entry.name();
try (InputStream stream = entry.stream()) {
byte[] bytes = readAllBytes(stream);
path = mn + "/" + path;
try {
resources.addResource(new ResourcePool.Resource(path,
ByteBuffer.wrap(bytes)));
} catch (Exception ex) {
throw new IOException(ex);
}
}
}
} finally {
// Done with this archive, close it.
archive.close();
}
}
return resources;
}