Skip to content

Support for JAR files with ResourceBundles as .properties at their root #3537

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

Closed
wants to merge 1 commit into from
Closed

Support for JAR files with ResourceBundles as .properties at their root #3537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 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,19 +79,17 @@ 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;
Set<Module> modules = null;
if (moduleName != null) {
modules = classLoaderSupport.findModule(moduleName).stream().collect(Collectors.toSet());
} else {
} else if (packageName != null) {
modules = packageToModules.getOrDefault(packageName, Collections.emptySet());
}
if (modules.isEmpty()) {
if (modules == null || modules.isEmpty()) {
/* If bundle is not located in any module get it via classloader (from ALL_UNNAMED) */
return Collections.singletonList(ResourceBundle.getBundle(bundleName, locale, classLoaderSupport.getClassLoader()));
}
assert packageName != null;
ArrayList<ResourceBundle> resourceBundles = new ArrayList<>();
for (Module module : modules) {
Module exportTargetModule = ClassLoaderSupportImplJDK11OrLater.class.getModule();
Expand Down