Ensure node exists when handler is disposed (openhab#792)

Signed-off-by: Chris Jackson <chris@cd-jackson.com> Signed-off-by: Chris Jackson <chris@cd-jackson.com>
pgaufillet · Sep 7, 2023 · 876a4db · 876a4db
1 parent 4d8802e
commit 876a4db
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...b.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeThingHandler.java b/...b.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeThingHandler.java
@@ -577,16 +577,17 @@ public void dispose() {
 
         stopPolling();
 
-        if (nodeIeeeAddress != null) {
-            if (coordinatorHandler != null) {
+        if (coordinatorHandler != null) {
+            coordinatorHandler.removeNetworkNodeListener(this);
+            coordinatorHandler.removeAnnounceListener(this);
+
+            if (nodeIeeeAddress != null && coordinatorHandler.getNode(nodeIeeeAddress) != null) {
                 ZclOtaUpgradeServer otaServer = getOtaServer(coordinatorHandler.getNode(nodeIeeeAddress));
                 if (otaServer != null) {
                     otaServer.removeListener(this);
                 }
-
-                coordinatorHandler.removeNetworkNodeListener(this);
-                coordinatorHandler.removeAnnounceListener(this);
             }
+
             nodeIeeeAddress = null;
         }