avoid NPE if serial port gets discovered too early

facchinm · facchinm · commit 2a677b4bcd20 · 2016-01-07T12:41:56.000+01:00
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -154,8 +154,10 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
     }
 
     BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
-    if (boardPort.getPrefs().get("iserial") != null) {
+    try {
       prefs.put("serial.port.iserial", boardPort.getPrefs().get("iserial"));
+    } catch (Exception e) {
+      // if serial port does not contain an iserial field
     }
 
     prefs.put("build.path", buildPath);

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,10 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));`
`157`		`- if (boardPort.getPrefs().get("iserial") != null) {`
	`157`	`+ try {`
`158`	`158`	`prefs.put("serial.port.iserial", boardPort.getPrefs().get("iserial"));`
	`159`	`+ } catch (Exception e) {`
	`160`	`+ // if serial port does not contain an iserial field`
`159`	`161`	`}`
`160`	`162`
`161`	`163`	`prefs.put("build.path", buildPath);`