Skip to content

Commit 0b06c48

Browse files
authored
Shutdown network when console startup fails (#1470)
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
1 parent 0f9bf7c commit 0b06c48

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

  • com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main

com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main/ZigBeeConsoleMain.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,9 @@ public static void main(final String[] args) {
332332

333333
// Initialise the network
334334
ZigBeeStatus initResponse = networkManager.initialize();
335-
System.out.println("networkManager.initialize returned " + initResponse);
336335
if (initResponse != ZigBeeStatus.SUCCESS) {
337-
console.start();
338-
System.out.println("Console closed.");
336+
networkManager.shutdown();
337+
System.out.println("Console closed. networkManager.initialize returned " + initResponse);
339338
return;
340339
}
341340

@@ -433,6 +432,8 @@ public static void main(final String[] args) {
433432

434433
if (networkManager.startup(resetNetwork) != ZigBeeStatus.SUCCESS) {
435434
System.out.println("ZigBee console starting up ... [FAIL]");
435+
networkManager.shutdown();
436+
return;
436437
} else {
437438
System.out.println("ZigBee console starting up ... [OK]");
438439
}

0 commit comments

Comments
 (0)