ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added robustness for invalid IeeeAdresses

Browse source
This commit is contained in:
Ziver Koc 2021-08-28 16:52:24 +02:00
parent ed04b687ed
commit 5e31cea660
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeHalDeviceConfig.java
View file

@ -9,14 +9,18 @@ import se.hal.intf.HalAbstractController;
import se.hal.intf.HalDeviceConfig; import se.hal.intf.HalDeviceConfig;
import se.hal.intf.HalDeviceData; import se.hal.intf.HalDeviceData;
import se.hal.plugin.zigbee.ZigbeeController; import se.hal.plugin.zigbee.ZigbeeController;
import zutil.log.LogUtil;
import zutil.ui.conf.Configurator; import zutil.ui.conf.Configurator;
import java.util.Objects; import java.util.Objects;
import java.util.logging.Logger;
/** /**
* A generic class that is extended by all Endpoint config classes. * A generic class that is extended by all Endpoint config classes.
*/ */
public abstract class ZigbeeHalDeviceConfig implements HalDeviceConfig { public abstract class ZigbeeHalDeviceConfig implements HalDeviceConfig {
private static final Logger logger = LogUtil.getLogger();
@Configurator.Configurable(value = "Node IeeeAddress") @Configurator.Configurable(value = "Node IeeeAddress")
private String zigbeeNodeAddressStr; private String zigbeeNodeAddressStr;
@ -26,7 +30,13 @@ public abstract class ZigbeeHalDeviceConfig implements HalDeviceConfig {
} }
public IeeeAddress getZigbeeNodeAddress() { public IeeeAddress getZigbeeNodeAddress() {
return new IeeeAddress(zigbeeNodeAddressStr); IeeeAddress address = null;
try {
address = new IeeeAddress(zigbeeNodeAddressStr);
} catch (IllegalArgumentException e) {
logger.warning("Unable to parse Zigbee IeeeAddress: " + zigbeeNodeAddressStr);
}
return address;
} }