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

8132994: /modules and /packages should not be parsed by the jimage parser

Browse Source 
Reviewed-by: sundar
This commit is contained in:
Jim Laskey 2016-04-26 11:55:52 -03:00
parent 5125f71376
commit fb8f4acea8
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageLocationWriter.java
View File

@ -61,24 +61,32 @@ public final class ImageLocationWriter extends ImageLocation {
String baseName;
String extensionName = "";
int offset = fullName.indexOf('/', 1);
if (fullName.length() >= 2 && fullName.charAt(0) == '/' && offset != -1) {
moduleName = fullName.substring(1, offset);
fullName = fullName.substring(offset + 1);
}
offset = fullName.lastIndexOf('/');
if (1 < offset) {
parentName = fullName.substring(0, offset);
fullName = fullName.substring(offset + 1);
}
offset = fullName.lastIndexOf('.');
if (offset != -1) {
baseName = fullName.substring(0, offset);
extensionName = fullName.substring(offset + 1);
if (fullName.startsWith("/modules/")) {
moduleName = "modules";
baseName = fullName.substring("/modules/".length());
} else if ( fullName.startsWith("/packages/")) {
moduleName = "packages";
baseName = fullName.substring("/packages/".length());
} else {
baseName = fullName;
int offset = fullName.indexOf('/', 1);
if (fullName.length() >= 2 && fullName.charAt(0) == '/' && offset != -1) {
moduleName = fullName.substring(1, offset);
fullName = fullName.substring(offset + 1);
}
offset = fullName.lastIndexOf('/');
if (1 < offset) {
parentName = fullName.substring(0, offset);
fullName = fullName.substring(offset + 1);
}
offset = fullName.lastIndexOf('.');
if (offset != -1) {
baseName = fullName.substring(0, offset);
extensionName = fullName.substring(offset + 1);
} else {
baseName = fullName;
}
}
return new ImageLocationWriter(strings)