From 3c0f2858004dc4a9b795c73b53ff3c4e8db38c73 Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Tue, 23 Apr 2024 15:45:15 +0200 Subject: [PATCH] Make PropertyMapper to use Keycloak options' default values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * improved a condition in PropertyMapper.java Co-authored-by: Steven Hawkins Co-authored-by: Václav Muzikář 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 3f64eb17553c..f0466062ab5b 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 @@ 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;