From ab0ae77f2fed2416d4dfcb3a0c9c486216877dcd Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Fri, 10 Apr 2026 10:41:11 +0200
Subject: [PATCH] Do not invoke disconnect callbacks on non-critical web socket
 transport error

---
 .../core/websocket/client/WebSocketClientService.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/websocket/client/src/main/java/org/phoebus/core/websocket/client/WebSocketClientService.java b/core/websocket/client/src/main/java/org/phoebus/core/websocket/client/WebSocketClientService.java
index 8aecf35427..e1d60f70e8 100644
--- a/core/websocket/client/src/main/java/org/phoebus/core/websocket/client/WebSocketClientService.java
+++ b/core/websocket/client/src/main/java/org/phoebus/core/websocket/client/WebSocketClientService.java
@@ -242,12 +242,12 @@ public void handleException(StompSession session, @Nullable StompCommand command
         public void handleTransportError(StompSession session, Throwable exception) {
             if (exception instanceof ConnectionLostException) {
                 logger.log(Level.WARNING, "Connection lost, will attempt to reconnect", exception);
+                if (disconnectCallback != null) {
+                    disconnectCallback.run();
+                }
                 connect();
             } else {
-                logger.log(Level.WARNING, "Handling transport exception", exception);
-            }
-            if (disconnectCallback != null) {
-                disconnectCallback.run();
+                logger.log(Level.WARNING, "Got transport exception", exception);
             }
         }
     }