From: Kai Kreuzer <kai@openhab.org>
Date: Wed, 2 Dec 2020 17:08:37 +0000 (+0100)
Subject: [miele] Properly shut down event listener job upon dispose (#9202)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=102f770881466e021a1ef7c2c89be82a4a5c2b04;p=openhab-addons.git

[miele] Properly shut down event listener job upon dispose (#9202)

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---

diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleBridgeHandler.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleBridgeHandler.java
index e2761d8ebb..76a4971675 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleBridgeHandler.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleBridgeHandler.java
@@ -398,7 +398,12 @@ public class MieleBridgeHandler extends BaseBridgeHandler {
                                     listener.onAppliancePropertyChanged(uid, dp);
                                 }
                             } catch (SocketTimeoutException e) {
-                                Thread.sleep(500);
+                                try {
+                                    Thread.sleep(500);
+                                } catch (InterruptedException ex) {
+                                    logger.debug("Eventlistener has been interrupted.");
+                                    break;
+                                }
                             }
                         }
                     } catch (Exception ex) {
@@ -633,5 +638,9 @@ public class MieleBridgeHandler extends BaseBridgeHandler {
             pollingJob.cancel(true);
             pollingJob = null;
         }
+        if (eventListenerJob != null) {
+            eventListenerJob.cancel(true);
+            eventListenerJob = null;
+        }
     }
 }