From 920b3614dca1faacd479dac7d15a73813a309201 Mon Sep 17 00:00:00 2001
From: Aleksandr Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Fri, 7 Jun 2024 13:32:35 +0400
Subject: [PATCH] CB-5253 remove null properties

---
 .../src/io/cloudbeaver/utils/WebAppUtils.java              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
index 14994e6b80..cd7e6571b3 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
@@ -87,7 +87,12 @@ public static Map<String, Object> mergeConfigurations(
             var additionalValue = additional.get(rootKey);
 
             if (originValue == null || additionalValue == null) {
-                var resultValue = originValue != null ? originValue : additionalValue;
+                Object resultValue = null;
+                if (additional.containsKey(rootKey)) {
+                    resultValue = additionalValue;
+                } else if (originValue != null) {
+                    resultValue = originValue;
+                }
                 resultConfig.put(rootKey, resultValue);
                 continue;
             }