From 466f6eda4024ad13a777eeada08e60384e344a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20W=C3=B6gerer?= Date: Fri, 2 Jul 2021 11:18:05 +0200 Subject: [PATCH 1/2] Fix bundle lookup for bundles in unnamed packages --- .../hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 index df9556d65046..ca0012e99af5 100644 --- 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 @@ -80,9 +80,6 @@ public List 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 modules; if (moduleName != null) { modules = classLoaderSupport.findModule(moduleName).stream().collect(Collectors.toSet()); @@ -107,8 +104,7 @@ public List 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); } From fd94991b8170ce2dc8eaabbbc5656866f47ff8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20W=C3=B6gerer?= Date: Fri, 2 Jul 2021 12:12:37 +0200 Subject: [PATCH 2/2] Remove unused import --- .../svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java | 1 - 1 file changed, 1 deletion(-) 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 index ca0012e99af5..cc81dad8f2e7 100644 --- 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 @@ -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;