From 86b280349b17aa401308c5a4ef21e726d795233f Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Thu, 25 Apr 2024 10:57:28 +0200 Subject: [PATCH] Make PropertyMapper to use Keycloak options' default values (#29030) * improved a condition in PropertyMapper.java Related to: #28856 Signed-off-by: Peter Zaoral --- .../quarkus/runtime/configuration/mappers/PropertyMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java index 3f64eb1755..f0466062ab 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java @@ -115,7 +115,7 @@ public class PropertyMapper { // try to obtain the value for the property we want to map first ConfigValue config = convertValue(context.proceed(from)); - if (config == null) { + if (config == null || config.getValue() == null) { if (mapFrom != null) { // if the property we want to map depends on another one, we use the value from the other property to call the mapper String parentKey = MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX + mapFrom;