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

Fixes: oraclegh-3535
zakkak · Jul 1, 2021 · 9a545aa · 9a545aa
1 parent f07d5e3
commit 9a545aa
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/....svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java b/....svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java
@@ -80,19 +80,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();