Revert "[shelly] Always try to stop WebSocketClient (openhab#15719)" (o…

…penhab#15720) This reverts commit 72622a1. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
austvik · Mar 27, 2024 · a919281 · a919281
1 parent 8c23f11
commit a919281
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/....binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2ApiRpc.java b/....binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2ApiRpc.java
@@ -141,8 +141,10 @@ public void initialize() throws ShellyApiException {
             rpcSocket.addMessageHandler(this);
             initialized = true;
         } else {
-            logger.debug("{}: Disconnect Rpc Socket on initialize", thingName);
-            disconnect();
+            if (rpcSocket.isConnected()) {
+                logger.debug("{}: Disconnect Rpc Socket on initialize", thingName);
+                disconnect();
+            }
         }
     }
 
@@ -1215,7 +1217,9 @@ private void reconnect() throws ShellyApiException {
     }
 
     private void disconnect() {
-        rpcSocket.disconnect();
+        if (rpcSocket.isConnected()) {
+            rpcSocket.disconnect();
+        }
     }
 
     public Shelly2RpctInterface getRpcHandler() {

diff --git a/...nding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2RpcSocket.java b/...nding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2RpcSocket.java
@@ -211,7 +211,9 @@ public void disconnect() {
                 s.close(StatusCode.NORMAL, "Socket closed");
                 session = null;
             }
-            client.stop();
+            if (client.isStarted()) {
+                client.stop();
+            }
         } catch (Exception e) {
             if (e.getCause() instanceof InterruptedException) {
                 logger.debug("{}: Unable to close socket - interrupted", thingName); // e.g. device was rebooted