Added dispose on reinit. Updated deprecated way of initializing sslco…

…ntextfactory
seaside1 · Oct 4, 2023 · 9884728 · 9884728
1 parent 4b07591
commit 9884728
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/openhab/binding/unifiprotect/internal/event/UniFiProtectEventManager.java b/src/main/java/org/openhab/binding/unifiprotect/internal/event/UniFiProtectEventManager.java
@@ -104,6 +104,7 @@ private synchronized void reinit() {
             reInitializationFuture = UniFiProtectUtil.delayedExecution(INITIALIZATION_DELAY_SECS, TimeUnit.SECONDS);
             reInitializationFuture.thenAcceptAsync(s -> {
                 logger.info("Socket failed, reinitializing!");
+                dispose();
                 final boolean startStatus = start();
                 reInitializationFuture = null;
                 if (!startStatus) {
@@ -165,6 +166,7 @@ public synchronized void stop() {
         try {
             socket.removePropertyChangeListener(this);
             wsClient.stop();
+            socket.dispose();
             cancelWatchDog();
             cancelReinitFuture();
             socket = null;

diff --git a/src/main/java/org/openhab/binding/unifiprotect/websocket/UniFiProtectEventWsClient.java b/src/main/java/org/openhab/binding/unifiprotect/websocket/UniFiProtectEventWsClient.java
@@ -46,7 +46,8 @@ public UniFiProtectEventWsClient(HttpClient httpClient, UniFiProtectJsonParser u
     }
 
     public UniFiProtectEventWebSocket start() throws IOException, Exception {
-        client = new WebSocketClient(new SslContextFactory(true));
+        final HttpClient httpClient = new HttpClient(new SslContextFactory.Client(true));
+        client = new WebSocketClient(httpClient);
         final UniFiProtectEventWebSocket socket = new UniFiProtectEventWebSocket(uniFiProtectJsonParser);
         client.start();
         final URI destUri = new URI(uri);