public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[shelly] Always try to stop WebSocketClient (#15719)" (#15720)

Browse Source 
This reverts commit 72622a1409.

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen
2023-10-08 13:46:27 +02:00
committed by GitHub
parent 5a5cfc28fb
commit 94f2837fe0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2ApiRpc.java
View File

@@ -141,8 +141,10 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
rpcSocket.addMessageHandler(this); rpcSocket.addMessageHandler(this);
initialized = true; initialized = true;
} else { } else {
logger.debug("{}: Disconnect Rpc Socket on initialize", thingName); if (rpcSocket.isConnected()) {
disconnect(); logger.debug("{}: Disconnect Rpc Socket on initialize", thingName);
disconnect();
}
} }
} }
@@ -1215,7 +1217,9 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
} }
private void disconnect() { private void disconnect() {
rpcSocket.disconnect(); if (rpcSocket.isConnected()) {
rpcSocket.disconnect();
}
} }
public Shelly2RpctInterface getRpcHandler() { public Shelly2RpctInterface getRpcHandler() {

4
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2RpcSocket.java
View File

@@ -211,7 +211,9 @@ public class Shelly2RpcSocket {
s.close(StatusCode.NORMAL, "Socket closed"); s.close(StatusCode.NORMAL, "Socket closed");
session = null; session = null;
} }
client.stop(); if (client.isStarted()) {
client.stop();
}
} catch (Exception e) { } catch (Exception e) {
if (e.getCause() instanceof InterruptedException) { if (e.getCause() instanceof InterruptedException) {
logger.debug("{}: Unable to close socket - interrupted", thingName); // e.g. device was rebooted logger.debug("{}: Unable to close socket - interrupted", thingName); // e.g. device was rebooted