If bundle is not located in any module get it via classloader (from A…

…LL_UNNAMED)
oracle · Jun 25, 2021 · 7302e45 · 7302e45
1 parent 89bb920
commit 7302e45
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -90,7 +90,8 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)
             modules = packageToModules.getOrDefault(packageName, Collections.emptySet());
         }
         if (modules.isEmpty()) {
-            throw new MissingResourceException("ResourceBundle cannot be found.", bundleSpec, locale.toLanguageTag());
+            /* If bundle is not located in any module get it via classloader (from ALL_UNNAMED) */
+            return Collections.singletonList(ResourceBundle.getBundle(bundleName, locale, classLoaderSupport.getClassLoader()));
         }
         ArrayList<ResourceBundle> resourceBundles = new ArrayList<>();
         for (Module module : modules) {