From d888549becc8c0f402c6837cd50a8de18a88c24e Mon Sep 17 00:00:00 2001
From: Ainur <59531286+yagudin10@users.noreply.github.com>
Date: Tue, 23 May 2023 13:10:04 +0200
Subject: [PATCH] CB-3071 easy config send event fix (#1683)

---
 .../src/io/cloudbeaver/server/CBApplication.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 6e97d79b29..8da3b910a8 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -240,6 +240,8 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
 
         configurationMode = CommonUtils.isEmpty(serverName);
 
+        eventController.setForceSkipEvents(isConfigurationMode()); // do not send events if configuration mode is on
+
         // Determine address for local host
         localHostAddress = System.getenv(CBConstants.VAR_CB_LOCAL_HOST_ADDR);
         if (CommonUtils.isEmpty(localHostAddress)) {
@@ -807,11 +809,6 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
 
         configurationMode = CommonUtils.isEmpty(serverName);
 
-        String sessionId = null;
-        if (credentialsProvider != null && credentialsProvider.getActiveUserCredentials() != null) {
-            sessionId = credentialsProvider.getActiveUserCredentials().getSmSessionId();
-        }
-
         // Reloading configuration by services
         for (DBWServiceServerConfigurator wsc : WebServiceRegistry.getInstance().getWebServices(DBWServiceServerConfigurator.class)) {
             try {
@@ -820,7 +817,13 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
                 log.warn("Error reloading configuration by web service " + wsc.getClass().getName(), e);
             }
         }
+
+        String sessionId = null;
+        if (credentialsProvider != null && credentialsProvider.getActiveUserCredentials() != null) {
+            sessionId = credentialsProvider.getActiveUserCredentials().getSmSessionId();
+        }
         eventController.addEvent(new WSServerConfigurationChangedEvent(sessionId, null));
+        eventController.setForceSkipEvents(isConfigurationMode());
     }
 
     protected Map<String, Object> readRuntimeConfigurationProperties() throws DBException {