From 9b15f03c3da9215f8eb5a40d6676ea6428142a50 Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Wed, 18 Jan 2023 11:02:45 +1300 Subject: [PATCH 1/6] Add check to avoid NPE when adding application with no supporting cluster (#1372) Signed-off-by: Chris Jackson Signed-off-by: Chris Jackson --- .../zsmartsystems/zigbee/ZigBeeEndpoint.java | 12 +++++--- .../zigbee/ZigBeeEndpointTest.java | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeEndpoint.java b/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeEndpoint.java index 765d59326..60557ca78 100644 --- a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeEndpoint.java +++ b/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeEndpoint.java @@ -399,17 +399,21 @@ public ZigBeeNode getParentNode() { * * @param application the new {@link ZigBeeApplication} * @return the {@link ZigBeeStatus} of the call. {@link ZigBeeStatus.SUCCESS} if the application was registered and - * started, and {@link ZigBeeStatus.INVALID_STATE} if an application is already registered to the cluster + * started, {@link ZigBeeStatus.INVALID_STATE} if an application is already registered to the cluster, and + * {@link ZigBeeStatus.UNSUPPORTED} if a valid cluster cannot be found in the endpoint */ public ZigBeeStatus addApplication(ZigBeeApplication application) { if (applications.get(application.getClusterId()) != null) { return ZigBeeStatus.INVALID_STATE; } - applications.put(application.getClusterId(), application); ZclCluster cluster = outputClusters.get(application.getClusterId()); if (cluster == null) { cluster = inputClusters.get(application.getClusterId()); } + if (cluster == null) { + return ZigBeeStatus.UNSUPPORTED; + } + applications.put(application.getClusterId(), application); return application.appStartup(cluster); } @@ -610,10 +614,10 @@ public Future sendTransaction(ZigBeeCommand command, ZigBeeTransa command.setDestinationAddress(getEndpointAddress()); return node.sendTransaction(command, responseMatcher); } - + /** * Gets the {@link NotificationService} provided by the {@link ZigBeeNetworkManager}. - * + * * @return the {@link NotificationService} provided by the {@link ZigBeeNetworkManager}. */ public NotificationService getNotificationService() { diff --git a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java index 4c7ca9619..626ab507a 100644 --- a/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java +++ b/com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeEndpointTest.java @@ -10,6 +10,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -21,6 +22,7 @@ import org.mockito.Mockito; import com.zsmartsystems.zigbee.app.ZigBeeApplication; +import com.zsmartsystems.zigbee.app.otaserver.ZclOtaUpgradeServer; import com.zsmartsystems.zigbee.database.ZigBeeEndpointDao; import com.zsmartsystems.zigbee.transaction.ZigBeeTransactionMatcher; import com.zsmartsystems.zigbee.zcl.ZclCluster; @@ -32,6 +34,7 @@ import com.zsmartsystems.zigbee.zcl.clusters.ZclCustomCluster; import com.zsmartsystems.zigbee.zcl.clusters.ZclDoorLockCluster; import com.zsmartsystems.zigbee.zcl.clusters.ZclLevelControlCluster; +import com.zsmartsystems.zigbee.zcl.clusters.ZclOtaUpgradeCluster; import com.zsmartsystems.zigbee.zcl.clusters.ZclScenesCluster; import com.zsmartsystems.zigbee.zcl.clusters.general.DefaultResponse; import com.zsmartsystems.zigbee.zcl.clusters.general.ReportAttributesCommand; @@ -270,6 +273,31 @@ public void setDao() { assertEquals(4, endpoint.getProfileId()); } + @Test + public void addApplication() { + ZigBeeEndpoint endpoint = getEndpoint(); + + ZclOtaUpgradeServer otaServer = (ZclOtaUpgradeServer) endpoint + .getApplication(ZclOtaUpgradeCluster.CLUSTER_ID); + + assertNull(endpoint.getApplication(ZclOtaUpgradeCluster.CLUSTER_ID)); + + assertEquals(ZigBeeStatus.UNSUPPORTED, endpoint.addApplication(new ZclOtaUpgradeServer())); + assertNull(endpoint.getApplication(ZclOtaUpgradeCluster.CLUSTER_ID)); + + endpoint.addInputCluster(new ZclOtaUpgradeCluster(endpoint)); + assertEquals(ZigBeeStatus.SUCCESS, endpoint.addApplication(new ZclOtaUpgradeServer())); + + endpoint.addInputCluster(new ZclOtaUpgradeCluster(endpoint)); + assertEquals(ZigBeeStatus.INVALID_STATE, endpoint.addApplication(new ZclOtaUpgradeServer())); + + otaServer = (ZclOtaUpgradeServer) endpoint.getApplication(ZclOtaUpgradeCluster.CLUSTER_ID); + assertNotNull(otaServer); + + endpoint.removeApplication(ZclOtaUpgradeCluster.CLUSTER_ID); + assertNull(endpoint.getApplication(ZclOtaUpgradeCluster.CLUSTER_ID)); + } + private ZigBeeEndpoint getEndpoint() { node = Mockito.mock(ZigBeeNode.class); Mockito.when(node.getIeeeAddress()).thenReturn(new IeeeAddress("1234567890ABCDEF")); From 03d083e592104e15f0a606f309661578b2276e0d Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Wed, 18 Jan 2023 16:34:01 +1300 Subject: [PATCH 2/6] Ensure network state is OFFLINE before SHUTDOWN (#1373) Signed-off-by: Chris Jackson Signed-off-by: Chris Jackson --- .../main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java b/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java index bb857f6f7..0213851b4 100644 --- a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java +++ b/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java @@ -703,6 +703,7 @@ public ZigBeeStatus reinitialize() { */ public void shutdown() { logger.debug("ZigBeeNetworkManager shutdown: networkState={}", networkState); + setNetworkState(ZigBeeNetworkState.OFFLINE); // To avoid deferred writes while we shut down, set the deferred write time to 0. databaseManager.setDeferredWriteTime(0); From e1913d90c2ba6db1563fa00f14529e139211eb3f Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Wed, 18 Jan 2023 17:20:24 +1300 Subject: [PATCH 3/6] [maven-release-plugin] prepare release zigbee-1.4.10 --- com.zsmartsystems.zigbee.autocode/pom.xml | 2 +- .../pom.xml | 8 +++---- com.zsmartsystems.zigbee.console.main/pom.xml | 22 +++++++++---------- .../pom.xml | 8 +++---- com.zsmartsystems.zigbee.console/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 2 +- com.zsmartsystems.zigbee.dongle.ember/pom.xml | 6 ++--- .../pom.xml | 4 ++-- .../pom.xml | 6 ++--- .../pom.xml | 4 ++-- com.zsmartsystems.zigbee.dongle.xbee/pom.xml | 4 ++-- com.zsmartsystems.zigbee.serial/pom.xml | 4 ++-- com.zsmartsystems.zigbee.test/pom.xml | 14 ++++++------ com.zsmartsystems.zigbee/pom.xml | 2 +- pom.xml | 4 ++-- releng/p2repo/pom.xml | 2 +- 18 files changed, 52 insertions(+), 52 deletions(-) diff --git a/com.zsmartsystems.zigbee.autocode/pom.xml b/com.zsmartsystems.zigbee.autocode/pom.xml index 13f067216..600bccf9d 100644 --- a/com.zsmartsystems.zigbee.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.autocode/pom.xml @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.console.ember/pom.xml b/com.zsmartsystems.zigbee.console.ember/pom.xml index 9ce129700..07b9bb4a7 100644 --- a/com.zsmartsystems.zigbee.console.ember/pom.xml +++ b/com.zsmartsystems.zigbee.console.ember/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,19 +17,19 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.console.main/pom.xml b/com.zsmartsystems.zigbee.console.main/pom.xml index 2edd82da6..ee58e6416 100644 --- a/com.zsmartsystems.zigbee.console.main/pom.xml +++ b/com.zsmartsystems.zigbee.console.main/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,61 +17,61 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.serial - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.cc2531 - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.conbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console.ember - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console.telegesis - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.console.telegesis/pom.xml b/com.zsmartsystems.zigbee.console.telegesis/pom.xml index 0a8ebd69f..deda7118f 100644 --- a/com.zsmartsystems.zigbee.console.telegesis/pom.xml +++ b/com.zsmartsystems.zigbee.console.telegesis/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,19 +17,19 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.console/pom.xml b/com.zsmartsystems.zigbee.console/pom.xml index 0c7e469d4..14b742ce5 100644 --- a/com.zsmartsystems.zigbee.console/pom.xml +++ b/com.zsmartsystems.zigbee.console/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml b/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml index 01e344b31..570de7b8b 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.conbee/pom.xml b/com.zsmartsystems.zigbee.dongle.conbee/pom.xml index 029c39d66..6c5fb1a86 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.conbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml index c56761d47..f9d343a94 100644 --- a/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml @@ -14,7 +14,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.ember/pom.xml b/com.zsmartsystems.zigbee.dongle.ember/pom.xml index a544a5b33..113a76d32 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.ember/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,13 +17,13 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 tests test diff --git a/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml index bf1925a79..f3ca2bec2 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis.autocode - 1.4.10-SNAPSHOT + 1.4.10 UTF-8 @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml b/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml index 4122d924d..1d17f9a94 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,13 +17,13 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 tests test diff --git a/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml index 2311f0940..915b06939 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee.autocode - 1.4.10-SNAPSHOT + 1.4.10 UTF-8 @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.dongle.xbee/pom.xml b/com.zsmartsystems.zigbee.dongle.xbee/pom.xml index 19634d987..6009ce965 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.xbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.serial/pom.xml b/com.zsmartsystems.zigbee.serial/pom.xml index f8c5cf205..66c413698 100644 --- a/com.zsmartsystems.zigbee.serial/pom.xml +++ b/com.zsmartsystems.zigbee.serial/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 @@ -21,7 +21,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee.test/pom.xml b/com.zsmartsystems.zigbee.test/pom.xml index 0b3ee5cf5..aa48870e9 100644 --- a/com.zsmartsystems.zigbee.test/pom.xml +++ b/com.zsmartsystems.zigbee.test/pom.xml @@ -8,39 +8,39 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.cc2531 - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee - 1.4.10-SNAPSHOT + 1.4.10 com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.conbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/com.zsmartsystems.zigbee/pom.xml b/com.zsmartsystems.zigbee/pom.xml index 3545800e5..064ce10f9 100644 --- a/com.zsmartsystems.zigbee/pom.xml +++ b/com.zsmartsystems.zigbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 diff --git a/pom.xml b/pom.xml index 49ef7a70a..274d15f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 pom ZssBee @@ -49,7 +49,7 @@ https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git - zigbee-1.1.3 + zigbee-1.4.10 diff --git a/releng/p2repo/pom.xml b/releng/p2repo/pom.xml index 1e05a70e3..78edb2c4e 100644 --- a/releng/p2repo/pom.xml +++ b/releng/p2repo/pom.xml @@ -10,7 +10,7 @@ com.zsmartsystems zigbee - 1.4.10-SNAPSHOT + 1.4.10 ../../ From e34df4b107389226c1886df0501a0242ec4e504e Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Wed, 18 Jan 2023 17:20:30 +1300 Subject: [PATCH 4/6] [maven-release-plugin] prepare for next development iteration --- com.zsmartsystems.zigbee.autocode/pom.xml | 2 +- .../pom.xml | 8 +++---- com.zsmartsystems.zigbee.console.main/pom.xml | 22 +++++++++---------- .../pom.xml | 8 +++---- com.zsmartsystems.zigbee.console/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 2 +- com.zsmartsystems.zigbee.dongle.ember/pom.xml | 6 ++--- .../pom.xml | 4 ++-- .../pom.xml | 6 ++--- .../pom.xml | 4 ++-- com.zsmartsystems.zigbee.dongle.xbee/pom.xml | 4 ++-- com.zsmartsystems.zigbee.serial/pom.xml | 4 ++-- com.zsmartsystems.zigbee.test/pom.xml | 14 ++++++------ com.zsmartsystems.zigbee/pom.xml | 2 +- pom.xml | 4 ++-- releng/p2repo/pom.xml | 2 +- 18 files changed, 52 insertions(+), 52 deletions(-) diff --git a/com.zsmartsystems.zigbee.autocode/pom.xml b/com.zsmartsystems.zigbee.autocode/pom.xml index 600bccf9d..b2880c6e7 100644 --- a/com.zsmartsystems.zigbee.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.autocode/pom.xml @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.console.ember/pom.xml b/com.zsmartsystems.zigbee.console.ember/pom.xml index 07b9bb4a7..6a054a876 100644 --- a/com.zsmartsystems.zigbee.console.ember/pom.xml +++ b/com.zsmartsystems.zigbee.console.ember/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,19 +17,19 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.console.main/pom.xml b/com.zsmartsystems.zigbee.console.main/pom.xml index ee58e6416..c2620be06 100644 --- a/com.zsmartsystems.zigbee.console.main/pom.xml +++ b/com.zsmartsystems.zigbee.console.main/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,61 +17,61 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.serial - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.cc2531 - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.conbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console.ember - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console.telegesis - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.console.telegesis/pom.xml b/com.zsmartsystems.zigbee.console.telegesis/pom.xml index deda7118f..d97353193 100644 --- a/com.zsmartsystems.zigbee.console.telegesis/pom.xml +++ b/com.zsmartsystems.zigbee.console.telegesis/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,19 +17,19 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.console - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.console/pom.xml b/com.zsmartsystems.zigbee.console/pom.xml index 14b742ce5..8b3e7dce1 100644 --- a/com.zsmartsystems.zigbee.console/pom.xml +++ b/com.zsmartsystems.zigbee.console/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml b/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml index 570de7b8b..0fb1ca58c 100644 --- a/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.cc2531/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.conbee/pom.xml b/com.zsmartsystems.zigbee.dongle.conbee/pom.xml index 6c5fb1a86..6029cb9dc 100644 --- a/com.zsmartsystems.zigbee.dongle.conbee/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.conbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml index f9d343a94..d4c1b1c53 100644 --- a/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml @@ -14,7 +14,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.ember/pom.xml b/com.zsmartsystems.zigbee.dongle.ember/pom.xml index 113a76d32..7fadf4d43 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.ember/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,13 +17,13 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT tests test diff --git a/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml index f3ca2bec2..40c8a1ee0 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis.autocode - 1.4.10 + 1.4.11-SNAPSHOT UTF-8 @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml b/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml index 1d17f9a94..17f0482bf 100644 --- a/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.telegesis/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,13 +17,13 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT tests test diff --git a/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml b/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml index 915b06939..cf05c1732 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee.autocode - 1.4.10 + 1.4.11-SNAPSHOT UTF-8 @@ -15,7 +15,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.dongle.xbee/pom.xml b/com.zsmartsystems.zigbee.dongle.xbee/pom.xml index 6009ce965..fbead5fe2 100644 --- a/com.zsmartsystems.zigbee.dongle.xbee/pom.xml +++ b/com.zsmartsystems.zigbee.dongle.xbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -17,7 +17,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.serial/pom.xml b/com.zsmartsystems.zigbee.serial/pom.xml index 66c413698..03d022e39 100644 --- a/com.zsmartsystems.zigbee.serial/pom.xml +++ b/com.zsmartsystems.zigbee.serial/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT @@ -21,7 +21,7 @@ com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee.test/pom.xml b/com.zsmartsystems.zigbee.test/pom.xml index aa48870e9..46d975f7c 100644 --- a/com.zsmartsystems.zigbee.test/pom.xml +++ b/com.zsmartsystems.zigbee.test/pom.xml @@ -8,39 +8,39 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.cc2531 - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.ember - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.telegesis - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.xbee - 1.4.10 + 1.4.11-SNAPSHOT com.zsmartsystems.zigbee com.zsmartsystems.zigbee.dongle.conbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/com.zsmartsystems.zigbee/pom.xml b/com.zsmartsystems.zigbee/pom.xml index 064ce10f9..69efeb02f 100644 --- a/com.zsmartsystems.zigbee/pom.xml +++ b/com.zsmartsystems.zigbee/pom.xml @@ -9,7 +9,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT diff --git a/pom.xml b/pom.xml index 274d15f2e..a2c29c8a7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT pom ZssBee @@ -49,7 +49,7 @@ https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git scm:git:https://github.com/zsmartsystems/com.zsmartsystems.zigbee.git - zigbee-1.4.10 + zigbee-1.1.3 diff --git a/releng/p2repo/pom.xml b/releng/p2repo/pom.xml index 78edb2c4e..1a8bea71a 100644 --- a/releng/p2repo/pom.xml +++ b/releng/p2repo/pom.xml @@ -10,7 +10,7 @@ com.zsmartsystems zigbee - 1.4.10 + 1.4.11-SNAPSHOT ../../ From c1e02c76fd3b509f1812ffd18186737c564f02d3 Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Sat, 21 Jan 2023 21:09:59 +1300 Subject: [PATCH 5/6] Fix typo in log entry in AshHandler (#1374) Signed-off-by: Chris Jackson Signed-off-by: Chris Jackson --- .../zigbee/dongle/ember/internal/ash/AshFrameHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java index 17d1b0f74..d0eb70b3a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java @@ -471,7 +471,7 @@ public void close() { try { parserThread.interrupt(); parserThread.join(); - logger.debug("AshFrameHandler parsed thread terminated."); + logger.debug("AshFrameHandler parser thread terminated."); } catch (InterruptedException e) { logger.debug("AshFrameHandler interrupted in packet parser thread shutdown join."); } From e649840e43025d061a82591edc0f4f6a4985da37 Mon Sep 17 00:00:00 2001 From: Chris Jackson Date: Mon, 6 Feb 2023 11:32:37 +1300 Subject: [PATCH 6/6] Explicitly remove transactions from queue on shutdown (#1376) Signed-off-by: Chris Jackson --- .../zigbee/transaction/ZigBeeTransactionQueue.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueue.java b/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueue.java index 7d66415fa..2694bce9a 100644 --- a/com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/transaction/ZigBeeTransactionQueue.java +++ b/com.zsmartsystems.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(); }