Fix potential nullpointer

merkle-open · Apr 17, 2024 · 99ab426 · 99ab426
1 parent 4930bc4
commit 99ab426
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...merkle/oss/magnolia/definition/custom/switchable/AbstractSwitchableDefinitionBuilder.java b/...merkle/oss/magnolia/definition/custom/switchable/AbstractSwitchableDefinitionBuilder.java
@@ -104,7 +104,7 @@ public SwitchableDefinition build(final String name) {
 		final SwitchableDefinition definition =new SwitchableDefinition(
 				propertyNameDecorator != null ? propertyNameDecorator : PrefixNameDecorator.class,
 				new RadioButtonGroupFieldDefinitionBuilder<Option>()
-						.defaultValue(getDefault(fieldOptions, selected).map(OptionEnum::getValue).orElse(null))
+						.defaultValue(Optional.ofNullable(fieldOptions).flatMap(options -> getDefault(options, selected)).map(OptionEnum::getValue).orElse(null))
 						.layout(Layout.horizontal)
 						.build(
 								Optional.ofNullable(optionPropertyNameDecorator).orElseGet(NoopNameDecorator::new).apply(name),