CB-4889 fix runtime conf priority

dbeaver · Jun 26, 2024 · 0e7f8c8 · 0e7f8c8
1 parent 00cd5e9
commit 0e7f8c8
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...dles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java b/...dles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
@@ -286,10 +286,17 @@ protected Map<String, Object> readConfiguration(Path configPath) throws DBExcept
 
             configProps.putAll(readConfigurationFile(configPath));
 
-            var mergedOriginalConfigs = WebAppUtils.mergeConfigurations(configProps, originalConfigurationProperties);
-            this.originalConfigurationProperties.clear();
-            // saves original configuration file
-            this.originalConfigurationProperties.putAll(mergedOriginalConfigs);
+            if (originalConfigurationProperties.isEmpty()) {
+                originalConfigurationProperties.putAll(configProps);
+            } else {
+                var mergedOriginalConfigs = WebAppUtils.mergeConfigurations(
+                    originalConfigurationProperties,
+                    configProps
+                );
+                this.originalConfigurationProperties.clear();
+                // saves original configuration file
+                this.originalConfigurationProperties.putAll(mergedOriginalConfigs);
+            }
 
             configProps.putAll(readConfigurationFile(configPath));
             patchConfigurationWithProperties(configProps); // patch original properties