[GR-65221] Issues when registering ResourceBundles with RuntimeResourceAccess

PullRequest: graal/20873

Author: kimeta

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -115,7 +115,7 @@ public static void addResourceBundle(Module module, String bundleName) {
     private static String withModuleName(Module module, String str) {
         Objects.requireNonNull(module);
         Objects.requireNonNull(str);
-        return (module.isNamed() ? module.getName() : "ALL-UNNAMED") + ":" + str;
+        return module.isNamed() ? module.getName() + ":" + str : str;
     }
 
     private RuntimeResourceAccess() {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java

@@ -81,6 +81,7 @@
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.FeatureImpl.AfterRegistrationAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
 import com.oracle.svm.hosted.ImageClassLoader;
@@ -279,6 +280,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
              */
             addProviders();
         }
+        this.imageClassLoader = ((AfterRegistrationAccessImpl) access).getImageClassLoader();
     }
 
     @Override
@@ -297,7 +299,6 @@ public void duringSetup(DuringSetupAccess a) {
         ServiceLoader.load(ResourceBundleControlProvider.class).stream()
                         .forEach(provider -> ImageSingletons.lookup(RuntimeClassInitializationSupport.class).initializeAtBuildTime(provider.type(), reason));
 
-        this.imageClassLoader = access.getImageClassLoader();
     }
 
     /**