From bb9cc88b1784b5624d14c45068edbd310d78b10e Mon Sep 17 00:00:00 2001 From: Aleksandr Skoblikov Date: Tue, 2 Jul 2024 18:02:02 +0400 Subject: [PATCH] CB-5323 less priority for .product.runtime.conf --- .../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 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 flattenConfig = WebAppUtils.flattenMap(productSettings); + runtimeProductSettings.putAll(productSettings); + Map flattenConfig = WebAppUtils.flattenMap(runtimeProductSettings); productSettings.clear(); productSettings.putAll(flattenConfig); } catch (Exception e) {