From 40535dfc5560e2bbdb2c9479d7b6b43ad3ae4234 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Mon, 13 Apr 2015 13:29:05 +0200 Subject: [PATCH] =?UTF-8?q?NetworkDiscovery=20was=20silently=20failing=20b?= =?UTF-8?q?ecause=20packages=20weren=C3=ACt=20ready=20yet.=20Fixes=20#2837?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/cc/arduino/packages/discoverers/NetworkDiscovery.java | 2 +- arduino-core/src/processing/app/Platform.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java b/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java index c913a410d..35995be6d 100644 --- 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 class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino. } 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 index cd80790a9..b2deee2f8 100644 --- a/arduino-core/src/processing/app/Platform.java +++ b/arduino-core/src/processing/app/Platform.java @@ -164,6 +164,8 @@ public class Platform { } public String resolveDeviceByBoardID(Map 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()) {