Skip to content

[GR-65574] Include resource bundles with -H:Preserve. #11593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2025
+14 −2
Merged

[GR-65574] Include resource bundles with -H:Preserve. #11593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private static boolean isBundleSupported(ResourceBundle bundle) {
}

@Platforms(Platform.HOSTED_ONLY.class)
private static boolean isBundleSupported(Class<?> bundleClass) {
public static boolean isBundleSupported(Class<?> bundleClass) {
return ListResourceBundle.class.isAssignableFrom(bundleClass) || OpenListResourceBundle.class.isAssignableFrom(bundleClass);
}

Expand Down
6 changes: 5 additions & 1 deletion substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,11 @@ public List<ResourceBundle> getResourceBundle(String bundleSpec, Locale locale)
} else {
Modules.addOpensToAllUnnamed(module, packageName);
}
resourceBundles.add(ResourceBundle.getBundle(bundleName, locale, module));
try {
resourceBundles.add(ResourceBundle.getBundle(bundleName, locale, module));
} catch (InternalError e) {
// ignore, nothing we can do
}
}
return resourceBundles;
}
Expand Down
8 changes: 8 additions & 0 deletions ...evm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport;
import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
import org.graalvm.nativeimage.impl.RuntimeResourceSupport;
import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;

import com.oracle.graal.pointsto.ClassInclusionPolicy;
import com.oracle.svm.core.SubstrateOptions;
import com.oracle.svm.core.jdk.localization.BundleContentSubstitutedLocalizationSupport;
import com.oracle.svm.core.option.AccumulatingLocatableMultiOptionValue;
import com.oracle.svm.core.option.LocatableMultiOptionValue;
import com.oracle.svm.core.option.SubstrateOptionsParser;
Expand Down Expand Up @@ -149,6 +151,7 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL
.toList();

final RuntimeReflectionSupport reflection = ImageSingletons.lookup(RuntimeReflectionSupport.class);
final RuntimeResourceSupport<ConfigurationCondition> resources = RuntimeResourceSupport.singleton();
final RuntimeProxyCreationSupport proxy = ImageSingletons.lookup(RuntimeProxyCreationSupport.class);
final RuntimeSerializationSupport<ConfigurationCondition> serialization = RuntimeSerializationSupport.singleton();
final ConfigurationCondition always = ConfigurationCondition.alwaysTrue();
Expand Down Expand Up @@ -205,6 +208,11 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL
// if we register as unsafe allocated earlier there are build-time
// initialization errors
reflection.register(always, !(c.isArray() || c.isInterface() || c.isPrimitive() || Modifier.isAbstract(c.getModifiers())), c);

/* Register resource bundles */
if (BundleContentSubstitutedLocalizationSupport.isBundleSupported(c)) {
resources.addResourceBundles(always, c.getTypeName());
}
});

/*
Expand Down
Loading