[enocean] Fix disposal of running tasks (#15329)

* Fix disposal of running tasks

Fixes #15328

---------

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>

diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java
index a5ffacc312b5c5bd6aa812bb5d3776017f2190a9..159a504dca60e34112e55f13f53a01625bd6bff0 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java
@@ -296,10 +296,10 @@ public class EnOceanBaseActuatorHandler extends EnOceanBaseSensorHandler {
 
     @Override
     public void dispose() {
-        ScheduledFuture<?> localRefreshJob = refreshJob;
-        if (localRefreshJob != null && !localRefreshJob.isCancelled()) {
-            localRefreshJob.cancel(true);
-            refreshJob = null;
+        ScheduledFuture<?> refreshJob = this.refreshJob;
+        if (refreshJob != null) {
+            refreshJob.cancel(true);
+            this.refreshJob = null;
         }
     }
 }

diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
index d242e0f2926feee78b712e89d8f1a4377a8267c6..d3f582e97f5e1a9b4c808db79e96139ecce1165b 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
@@ -202,9 +202,9 @@ public class EnOceanBaseSensorHandler extends EnOceanBaseThingHandler implements
                 // fire trigger for receive
                 triggerChannel(prepareAnswer, "requestAnswer");
                 // Send response after 100ms
-                ScheduledFuture<?> localResponseFuture = responseFuture;
-                if (localResponseFuture == null || localResponseFuture.isDone()) {
-                    localResponseFuture = scheduler.schedule(this::sendRequestResponse, 100, TimeUnit.MILLISECONDS);
+                ScheduledFuture<?> responseFuture = this.responseFuture;
+                if (responseFuture == null || responseFuture.isDone()) {
+                    this.responseFuture = scheduler.schedule(this::sendRequestResponse, 100, TimeUnit.MILLISECONDS);
                 }
             }
         }

diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java
index 0a4cb5f3f8367fde500ef1c743d8f8964424235c..303936c1685ef161c23ecf3e7f5b9f20f4a277af 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java
@@ -165,17 +165,14 @@ public class EnOceanBridgeHandler extends ConfigStatusBridgeHandler implements T
     public void initialize() {
         updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_PENDING, "trying to connect to gateway...");
 
-        ScheduledFuture<?> localConnectorTask = connectorTask;
-        if (localConnectorTask == null || localConnectorTask.isDone()) {
-            localConnectorTask = scheduler.scheduleWithFixedDelay(new Runnable() {
-                @Override
-                public void run() {
-                    if (thing.getStatus() != ThingStatus.ONLINE) {
-                        initTransceiver();
-                    }
+        connectorTask = scheduler.scheduleWithFixedDelay(new Runnable() {
+            @Override
+            public void run() {
+                if (thing.getStatus() != ThingStatus.ONLINE) {
+                    initTransceiver();
                 }
-            }, 0, 60, TimeUnit.SECONDS);
-        }
+            }
+        }, 0, 60, TimeUnit.SECONDS);
     }
 
     private synchronized void initTransceiver() {
@@ -303,16 +300,16 @@ public class EnOceanBridgeHandler extends ConfigStatusBridgeHandler implements T
 
     @Override
     public synchronized void dispose() {
-        EnOceanTransceiver localTransceiver = transceiver;
-        if (localTransceiver != null) {
-            localTransceiver.shutDown();
-            transceiver = null;
+        EnOceanTransceiver transceiver = this.transceiver;
+        if (transceiver != null) {
+            transceiver.shutDown();
+            this.transceiver = null;
         }
 
-        ScheduledFuture<?> localConnectorTask = connectorTask;
-        if (localConnectorTask != null && !localConnectorTask.isDone()) {
-            localConnectorTask.cancel(true);
-            connectorTask = null;
+        ScheduledFuture<?> connectorTask = this.connectorTask;
+        if (connectorTask != null) {
+            connectorTask.cancel(true);
+            this.connectorTask = null;
         }
 
         super.dispose();

diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java
index f0d94de609b1cce0e6d904f408c6e7daf24351dd..ae1ca731484f9d64c70dd4c88a2dc72020919585 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java
@@ -276,13 +276,12 @@ public class EnOceanClassicDeviceHandler extends EnOceanBaseActuatorHandler {
 
     @Override
     public void handleRemoval() {
-        ScheduledFuture<?> future = releaseFuture;
-        if (future != null && !future.isDone()) {
-            future.cancel(true);
-            future = null;
+        ScheduledFuture<?> releaseFuture = this.releaseFuture;
+        if (releaseFuture != null) {
+            releaseFuture.cancel(true);
+            this.releaseFuture = null;
         }
 
-        releaseFuture = null;
         super.handleRemoval();
     }
 }

diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java
index 145d8ae39db7d6aa9692790bd990e8b56f1cf039..07b2eda11658a060d45704fce2a723383561e75d 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java
@@ -59,7 +59,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
 
     // Thread management
     protected @Nullable Future<?> readingTask = null;
-    private @Nullable Future<?> timeOut = null;
+    private @Nullable Future<?> timeOutTask = null;
 
     protected Logger logger = LoggerFactory.getLogger(EnOceanTransceiver.class);
 
@@ -121,14 +121,14 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
                                     localOutPutStream.write(b);
                                     localOutPutStream.flush();
                                 }
-                                Future<?> localTimeOut = timeOut;
-                                if (localTimeOut != null) {
-                                    localTimeOut.cancel(true);
+                                Future<?> localTimeOutTask = timeOutTask;
+                                if (localTimeOutTask != null) {
+                                    localTimeOutTask.cancel(true);
                                 }
 
                                 // slowdown sending of message to avoid hickups at receivers
                                 // Todo tweak sending intervall (250 ist just a first try)
-                                timeOut = scheduler.schedule(() -> {
+                                timeOutTask = scheduler.schedule(() -> {
                                     try {
                                         sendNext();
                                     } catch (IOException e) {
@@ -222,9 +222,9 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
 
     public void startReceiving(ScheduledExecutorService scheduler) {
         @Nullable
-        Future<?> localReadingTask = readingTask;
-        if (localReadingTask == null || localReadingTask.isCancelled()) {
-            readingTask = scheduler.submit(new Runnable() {
+        Future<?> readingTask = this.readingTask;
+        if (readingTask == null || readingTask.isCancelled()) {
+            this.readingTask = scheduler.submit(new Runnable() {
                 @Override
                 public void run() {
                     receivePackets();
@@ -238,14 +238,15 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
         logger.debug("shutting down transceiver");
         logger.debug("Interrupt rx Thread");
 
-        Future<?> localTimeOut = timeOut;
-        if (localTimeOut != null) {
-            localTimeOut.cancel(true);
+        Future<?> timeOutTask = this.timeOutTask;
+        if (timeOutTask != null) {
+            timeOutTask.cancel(true);
+            this.timeOutTask = null;
         }
 
-        Future<?> localReadingTask = readingTask;
-        if (localReadingTask != null) {
-            localReadingTask.cancel(true);
+        Future<?> readingTask = this.readingTask;
+        if (readingTask != null) {
+            readingTask.cancel(true);
 
             InputStream localInputStream = inputStream;
             if (localInputStream != null) {
@@ -255,10 +256,9 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
                     logger.debug("IOException occured while closing the stream", e);
                 }
             }
+            this.readingTask = null;
         }
 
-        readingTask = null;
-        timeOut = null;
         listeners.clear();
         eventListeners.clear();
         teachInListener = null;
@@ -298,8 +298,8 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
     private void receivePackets() {
         byte[] buffer = new byte[1];
 
-        Future<?> localReadingTask = readingTask;
-        while (localReadingTask != null && !localReadingTask.isCancelled()) {
+        Future<?> readingTask = this.readingTask;
+        while (readingTask != null && !readingTask.isCancelled()) {
             int bytesRead = read(buffer, 1);
             if (bytesRead > 0) {
                 processMessage(buffer[0]);
@@ -320,10 +320,10 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener {
             }
         } else {
             logger.warn("Cannot read from null stream");
-            Future<?> localReadingTask = readingTask;
-            if (localReadingTask != null) {
-                localReadingTask.cancel(true);
-                readingTask = null;
+            Future<?> readingTask = this.readingTask;
+            if (readingTask != null) {
+                readingTask.cancel(true);
+                this.readingTask = null;
             }
             TransceiverErrorListener localListener = errorListener;
             if (localListener != null) {