If bundle is not located in any module get it via classloader (from ALL_UNNAMED)

olpaw · olpaw · commit 7302e457bd78 · 2021-06-25T15:20:11.000+02:00
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java b/substratevm/src/com.oracle.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) {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)`
`90`	`90`	`modules = packageToModules.getOrDefault(packageName, Collections.emptySet());`
`91`	`91`	`}`
`92`	`92`	`if (modules.isEmpty()) {`
`93`		`- throw new MissingResourceException("ResourceBundle cannot be found.", bundleSpec, locale.toLanguageTag());`
	`93`	`+ /* If bundle is not located in any module get it via classloader (from ALL_UNNAMED) */`
	`94`	`+ return Collections.singletonList(ResourceBundle.getBundle(bundleName, locale, classLoaderSupport.getClassLoader()));`
`94`	`95`	`}`
`95`	`96`	`ArrayList<ResourceBundle> resourceBundles = new ArrayList<>();`
`96`	`97`	`for (Module module : modules) {`