opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-16 06:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5323 less priority for .product.runtime.conf (#2754)

Browse Source 
Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
This commit is contained in:
Alexander Skoblikov
2024-07-02 20:00:02 +02:00
committed by GitHub
co-authored by mr-anton-t
parent 1e2eee87d3
commit 042da7cc7c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
+2 -2
View File
@@ -253,8 +253,8 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
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) {