Make PropertyMapper to use Keycloak options' default values (#29030)

Pepo48 · web-flow · commit 86b280349b17 · 2024-04-25T10:57:28.000+02:00
* improved a condition in PropertyMapper.java Related to: #28856 Signed-off-by: Peter Zaoral <pzaoral@redhat.com>
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
@@ -115,7 +115,7 @@ ConfigValue getConfigValue(String name, ConfigSourceInterceptorContext context)
         // 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;
