Skip to content

Commit c3456cb

Browse files
committed
Add MODULE_KEY to optionalAttrs in ResourceBundle configuration parsing
1 parent 0e9791b commit c3456cb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourceConfigurationParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ protected void parseBundlesObject(Object bundlesObject) {
7171
protected void parseBundle(Object bundle, boolean inResourcesSection) {
7272
EconomicMap<String, Object> resource = asMap(bundle, "Elements of 'bundles' list must be a bundle descriptor object");
7373
String bundleNameAttribute = inResourcesSection ? BUNDLE_KEY : NAME_KEY;
74-
checkAttributes(resource, "bundle descriptor object", Collections.singletonList(bundleNameAttribute), Arrays.asList("locales", "classNames", "condition"));
74+
checkAttributes(resource, "bundle descriptor object", Collections.singletonList(bundleNameAttribute), Arrays.asList(MODULE_KEY, "locales", "classNames", "condition"));
7575
String basename = asString(resource.get(bundleNameAttribute));
7676
TypeResult<C> resolvedConfigurationCondition = conditionResolver.resolveCondition(parseCondition(resource));
7777
if (!resolvedConfigurationCondition.isPresent()) {
7878
return;
7979
}
80+
// TODO GR-67556 - Add full support for MODULE_KEY in ResourceBundle configurations
8081
Object locales = resource.get("locales");
8182
if (locales != null) {
8283
List<Locale> asList = asList(locales, "Attribute 'locales' must be a list of locales")

0 commit comments

Comments
 (0)