From 3cd96cfc82bd0ad95ac879294ad504aad4c6bfd7 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 12 Jul 2021 22:39:57 +0200 Subject: [PATCH] Some Zigbee bugfixes --- .../src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java | 2 +- .../se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java index d3bf26f7..51989c71 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java @@ -130,7 +130,7 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore { * A private data storage object connected to the DB schema. */ @DBBean.DBTable(ZIGBEE_NODE_TABLE) - private static class ZigbeeNodeDSO extends DBBean { + public static class ZigbeeNodeDSO extends DBBean { protected String address; protected String config; diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java index 7ceda7a9..0e055c2e 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java @@ -56,7 +56,9 @@ public abstract class ZigbeeHalDeviceConfig implements HalDeviceConfig { if (!(o instanceof ZigbeeHalDeviceConfig)) return false; ZigbeeHalDeviceConfig that = (ZigbeeHalDeviceConfig) o; - return Objects.equals(zigbeeNodeAddressStr, that.zigbeeNodeAddressStr); + return this.getClass() == that.getClass() && + Objects.equals(zigbeeNodeAddressStr, that.zigbeeNodeAddressStr) && + this.getZigbeeClusterId() == that.getZigbeeClusterId(); }