[bosesoundtouch] fix possible resource leak (openhab#8031)

Signed-off-by: Jan N. Klug <[email protected]>
andrewfg · Aug 31, 2020 · 0589cca · 0589cca
1 parent b429b43
commit 0589cca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/bundles/org.openhab.binding.bosesoundtouch/pom.xml b/bundles/org.openhab.binding.bosesoundtouch/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java b/.../main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
@@ -21,6 +21,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -93,6 +94,8 @@ public class BoseSoundTouchHandler extends BaseThingHandler implements WebSocket
     private PresetContainer presetContainer;
     private BoseStateDescriptionOptionProvider stateOptionProvider;
 
+    private Future<?> sessionFuture;
+
     /**
      * Creates a new instance of this class for the {@link Thing}.
      *
@@ -423,7 +426,7 @@ private synchronized void openConnection() {
             request.setSubProtocols("gabbo");
             client.setStopTimeout(1000);
             client.start();
-            client.connect(this, new URI(wsUrl), request);
+            sessionFuture = client.connect(this, new URI(wsUrl), request);
         } catch (Exception e) {
             onWebSocketError(e);
         }
@@ -439,7 +442,10 @@ private synchronized void closeConnection() {
             }
             session = null;
         }
-        if (client != null) {
+        if (sessionFuture != null && !sessionFuture.isDone()) {
+            sessionFuture.cancel(true);
+        }
+        if (client != null && client.isStarted()) {
             try {
                 client.stop();
                 client.destroy();