fix possible resource leak (openhab#8035)

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
markus7017 · Sep 18, 2020 · 819b2aa · 819b2aa
1 parent 429c80c
commit 819b2aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/bundles/org.openhab.binding.valloxmv/pom.xml b/bundles/org.openhab.binding.valloxmv/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/...nding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java b/...nding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.websocket.api.Session;
@@ -81,18 +82,23 @@ public ValloxMVWebSocket(WebSocketClient webSocketClient, ValloxMVHandler voHand
  }
 
  public void request(ChannelUID channelUID, String updateState) {
+ Future<?> sessionFuture = null;
  try {
  socket = new ValloxMVWebSocketListener(channelUID, updateState);
 
  ClientUpgradeRequest request = new ClientUpgradeRequest();
  logger.debug("Connecting to: {}", destUri);
- client.connect(socket, destUri, request);
+ sessionFuture = client.connect(socket, destUri, request);
  socket.awaitClose(2, TimeUnit.SECONDS);
  } catch (InterruptedException | IOException e) {
  connectionError(e);
  } catch (Exception e) {
  logger.debug("Unexpected error");
  connectionError(e);
+ } finally {
+ if (sessionFuture != null && !sessionFuture.isDone()) {
+ sessionFuture.cancel(true);
+ }
  }
  }