Skip to content

[GR-32432] Fix bundle lookup for bundles in unnamed packages. #3540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2021
Merged

[GR-32432] Fix bundle lookup for bundles in unnamed packages. #3540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
466f6ed
Fix bundle lookup for bundles in unnamed packages
olpaw Jul 2, 2021
fd94991
Remove unused import
olpaw Jul 2, 2021
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
7 changes: 1 addition & 6 deletions ....svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -80,9 +79,6 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)
bundleName = specParts[0];
}
String packageName = packageName(bundleName);
if (packageName == null) {
throw new MissingResourceException("ResourceBundle does not seem to be a fully qualified class name.", bundleName, locale.toLanguageTag());
}
Set<Module> modules;
if (moduleName != null) {
modules = classLoaderSupport.findModule(moduleName).stream().collect(Collectors.toSet());
Expand All @@ -107,8 +103,7 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)
private static String packageName(String bundleName) {
int classSep = bundleName.replace('/', '.').lastIndexOf('.');
if (classSep == -1) {
/* The bundle is not specified via a java.class or java.properties format. */
return null;
return ""; /* unnamed package */
}
return bundleName.substring(0, classSep);
}
Expand Down