Explicitly remove transactions from queue on shutdown (#1376)

Signed-off-by: Chris Jackson <[email protected]>
zsmartsystems · Feb 5, 2023 · e649840 · e649840
1 parent c1e02c7
commit e649840
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...ems.zigbee/src/main/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueue.java b/...ems.zigbee/src/main/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueue.java
@@ -132,7 +132,11 @@ protected void shutdown() {
         isShutdown = true;
 
         // Cancel any queued transactions
-        for (ZigBeeTransaction transaction : queue) {
+        while (!queue.isEmpty()) {
+            ZigBeeTransaction transaction = queue.poll();
+            if (transaction == null) {
+                break;
+            }
             transaction.cancel();
         }