From 2e5ee62a114bb04ebfec4391a5afaf9f4432f913 Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Tue, 20 May 2025 10:56:45 +0200
Subject: [PATCH] Terminate connection attempts when app is closed

---
 .../java/org/phoebus/core/websocket/WebSocketClient.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java b/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java
index ef51e31ce7..5d7d8242db 100644
--- a/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java
+++ b/core/websocket/src/main/java/org/phoebus/core/websocket/WebSocketClient.java
@@ -178,7 +178,11 @@ public CompletionStage<?> onText(WebSocket webSocket,
      */
     public void close(String reason) {
         keepPinging.set(false);
-        webSocket.sendClose(1000, reason);
+        attemptReconnect.set(false);
+        // webSocket is null if never connected
+        if(webSocket != null){
+            webSocket.sendClose(1000, reason);
+        }
     }
 
     /**