From 042da7cc7c858eda2e00acbd0d1a8e6dac62026f Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Tue, 2 Jul 2024 21:00:02 +0300
Subject: [PATCH] CB-5323 less priority for .product.runtime.conf (#2754)

Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
---
 .../cloudbeaver/server/CBServerConfigurationController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
index 8e6a76f602..f5185fcc6e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
@@ -253,8 +253,8 @@ protected void readProductConfiguration(Map<String, Object> serverConfig, Gson g
             try (Reader reader = new InputStreamReader(new FileInputStream(rtConfig), StandardCharsets.UTF_8)) {
                 var runtimeProductSettings = JSONUtils.parseMap(gson, reader);
                 var productSettings = serverConfiguration.getProductSettings();
-                productSettings.putAll(runtimeProductSettings);
-                Map<String, Object> flattenConfig = WebAppUtils.flattenMap(productSettings);
+                runtimeProductSettings.putAll(productSettings);
+                Map<String, Object> flattenConfig = WebAppUtils.flattenMap(runtimeProductSettings);
                 productSettings.clear();
                 productSettings.putAll(flattenConfig);
             } catch (Exception e) {