Skip to content

Commit 109d174

Browse files
committed
Minor updates following comments
1 parent a9f1cf1 commit 109d174

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNetworkManager.java

+8-22
Original file line numberDiff line numberDiff line change
@@ -2091,23 +2091,6 @@ public ZigBeeStatus restoreBackup(UUID uuid) {
20912091
}
20922092
logger.debug("RestoreBackup: Backup read from {}", uuid);
20932093

2094-
switch (getNetworkState()) {
2095-
case UNINITIALISED:
2096-
break;
2097-
case INITIALISING:
2098-
break;
2099-
case ONLINE:
2100-
break;
2101-
case OFFLINE:
2102-
break;
2103-
case SHUTDOWN:
2104-
break;
2105-
default:
2106-
break;
2107-
}
2108-
2109-
logger.debug("RestoreBackup: Taking network down");
2110-
21112094
// Take the network offline for reconfiguration
21122095
transport.setNetworkState(ZigBeeNetworkState.UNINITIALISED);
21132096

@@ -2147,11 +2130,14 @@ public ZigBeeStatus restoreBackup(UUID uuid) {
21472130
}
21482131

21492132
// Set the network configuration
2150-
setZigBeePanId(backup.getPan());
2151-
setZigBeeExtendedPanId(backup.getEpan());
2152-
setZigBeeChannel(backup.getChannel());
2153-
setZigBeeNetworkKey(backup.getNetworkKey());
2154-
setZigBeeLinkKey(backup.getLinkKey());
2133+
if (setZigBeePanId(backup.getPan()) != ZigBeeStatus.SUCCESS
2134+
|| setZigBeeExtendedPanId(backup.getEpan()) != ZigBeeStatus.SUCCESS
2135+
|| setZigBeeChannel(backup.getChannel()) != ZigBeeStatus.SUCCESS
2136+
|| setZigBeeNetworkKey(backup.getNetworkKey()) != ZigBeeStatus.SUCCESS
2137+
|| setZigBeeLinkKey(backup.getLinkKey()) != ZigBeeStatus.SUCCESS) {
2138+
setNetworkState(ZigBeeNetworkState.OFFLINE);
2139+
return ZigBeeStatus.FAILURE;
2140+
}
21552141

21562142
// Remove all existing nodes
21572143
for (ZigBeeNode node : networkNodes.values()) {

0 commit comments

Comments
 (0)