Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,7 @@ private String determineSimpleResourceName(Path resourceFile) {
private String determineSubpackageName(Path baseDir, Path file) {
Path relativePath = baseDir.relativize(file.getParent());
String pathSeparator = baseDir.getFileSystem().getSeparator();
String subpackageName = relativePath.toString().replace(pathSeparator, PACKAGE_SEPARATOR_STRING);
if (subpackageName.endsWith(pathSeparator)) {
// TODO: Remove workaround for JDK bug: https://bugs.openjdk.org/browse/JDK-8153248
subpackageName = subpackageName.substring(0, subpackageName.length() - pathSeparator.length());
}
return subpackageName;
return relativePath.toString().replace(pathSeparator, PACKAGE_SEPARATOR_STRING);
}

private void handleInternalError(Path classFile, String fullyQualifiedClassName, InternalError ex) {
Expand Down
Loading