From 350adb99cb1394ad9c3e03b99324a85a3e521c4a Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 13 Apr 2015 13:38:55 +0200
Subject: [PATCH] Also SerialDiscovery was affected by bug found at
 40535dfc5560e2bbdb2c9479d7b6b43ad3ae4234. Fixes #2892

---
 .../packages/discoverers/serial/SerialBoardsLister.java       | 4 ++++
 arduino-core/src/processing/app/linux/Platform.java           | 1 +
 arduino-core/src/processing/app/macosx/Platform.java          | 1 +
 arduino-core/src/processing/app/windows/Platform.java         | 1 +
 4 files changed, 7 insertions(+)

diff --git a/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java b/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
index 08dc3af3e..84439ae40 100644
--- a/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
+++ b/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
@@ -55,6 +55,10 @@ public class SerialBoardsLister extends TimerTask {
 
   @Override
   public void run() {
+    if (BaseNoGui.packages == null) {
+      return;
+    }
+
     Platform platform = BaseNoGui.getPlatform();
     if (platform == null) {
       return;
diff --git a/arduino-core/src/processing/app/linux/Platform.java b/arduino-core/src/processing/app/linux/Platform.java
index eecb3aba6..ed91ea0a7 100644
--- a/arduino-core/src/processing/app/linux/Platform.java
+++ b/arduino-core/src/processing/app/linux/Platform.java
@@ -122,6 +122,7 @@ public class Platform extends processing.app.Platform {
 
   @Override
   public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
+    assert packages != null;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     Executor executor = new CollectStdOutExecutor(baos);
 
diff --git a/arduino-core/src/processing/app/macosx/Platform.java b/arduino-core/src/processing/app/macosx/Platform.java
index 04ffda917..f12ebae0e 100644
--- a/arduino-core/src/processing/app/macosx/Platform.java
+++ b/arduino-core/src/processing/app/macosx/Platform.java
@@ -191,6 +191,7 @@ public class Platform extends processing.app.Platform {
 
   @Override
   public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
+    assert packages != null;
     if (devicesListOutput == null) {
       return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
     }
diff --git a/arduino-core/src/processing/app/windows/Platform.java b/arduino-core/src/processing/app/windows/Platform.java
index a370f28b5..cfc2f497d 100644
--- a/arduino-core/src/processing/app/windows/Platform.java
+++ b/arduino-core/src/processing/app/windows/Platform.java
@@ -286,6 +286,7 @@ public class Platform extends processing.app.Platform {
 
   @Override
   public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
+    assert packages != null;
     if (devicesListOutput == null) {
       return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
     }