Fix adding NULL value to the preferences when iserial is not defined

Me No Dev · cmaglie · commit 2893c2d64314 · 2016-01-25T09:52:43.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
@@ -155,7 +155,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
 
     BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
     try {
-      prefs.put("serial.port.iserial", boardPort.getPrefs().get("iserial"));
+      prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
     } catch (Exception e) {
       // if serial port does not contain an iserial field
     }

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