NetworkDiscovery was silently failing because packages werenìt ready yet. Fixes #2837

Federico Fissore · Federico Fissore · commit 40535dfc5560 · 2015-04-13T13:29:05.000+02:00
diff --git a/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java b/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
@@ -137,7 +137,7 @@ public void serviceResolved(ServiceEvent serviceEvent) {
       }
 
       String label = name + " at " + address;
-      if (board != null) {
+      if (board != null && BaseNoGui.packages != null) {
         String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
         if (boardName != null) {
           label += " (" + boardName + ")";
diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
@@ -164,6 +164,8 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe
   }
 
   public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {
+    assert packages != null;
+    assert boardId != null;
     for (TargetPackage targetPackage : packages.values()) {
       for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {
         for (TargetBoard board : targetPlatform.getBoards().values()) {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public void serviceResolved(ServiceEvent serviceEvent) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`String label = name + " at " + address;`
`140`		`- if (board != null) {`
	`140`	`+ if (board != null && BaseNoGui.packages != null) {`
`141`	`141`	`String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);`
`142`	`142`	`if (boardName != null) {`
`143`	`143`	`label += " (" + boardName + ")";`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,8 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {`
	`167`	`+ assert packages != null;`
	`168`	`+ assert boardId != null;`
`167`	`169`	`for (TargetPackage targetPackage : packages.values()) {`
`168`	`170`	`for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {`
`169`	`171`	`for (TargetBoard board : targetPlatform.getBoards().values()) {`