[Satel] Binding deactivation fix (#5207)

openhab · Aug 4, 2017 · 3d8834c · 3d8834c
1 parent 5b27bda
commit 3d8834c
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/....binding.satel/src/main/java/org/openhab/binding/satel/internal/protocol/SatelModule.java b/....binding.satel/src/main/java/org/openhab/binding/satel/internal/protocol/SatelModule.java
@@ -154,10 +154,20 @@ public synchronized void open() {
      * Stops communication by disconnecting from the module and stopping all
      * background tasks.
      */
-    public synchronized void close() {
+    public void close() {
+        // first we clear watchdog field in the object
+        CommunicationWatchdog watchdog = null;
         if (this.communicationWatchdog != null) {
-            this.communicationWatchdog.close();
-            this.communicationWatchdog = null;
+            synchronized (this) {
+                if (this.communicationWatchdog != null) {
+                    watchdog = this.communicationWatchdog;
+                    this.communicationWatchdog = null;
+                }
+            }
+        }
+        // then, if watchdog exists, we close it
+        if (watchdog != null) {
+            watchdog.close();
         }
     }