Merge pull request #2126 from damellis/issue-1791

Proceed with upload even if port can't be found.

Author: cmaglie

app/src/cc/arduino/packages/UploaderAndMonitorFactory.java

@@ -40,7 +40,7 @@
 public class UploaderAndMonitorFactory {
 
   public Uploader newUploader(TargetBoard board, BoardPort port) {
-    if ("true".equals(board.getPreferences().get("upload.via_ssh")) && "network".equals(port.getProtocol())) {
+    if ("true".equals(board.getPreferences().get("upload.via_ssh")) && port != null && "network".equals(port.getProtocol())) {
       return new SSHUploader(port);
     }
 

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -121,6 +121,8 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       String pattern = prefs.getOrExcept("upload.pattern");
       String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       uploadResult = executeUploadCommand(cmd);
+    } catch (RunnerException e) {
+      throw e;
     } catch (Exception e) {
       throw new RunnerException(e);
     }
@@ -228,6 +230,8 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws
       String pattern = prefs.getOrExcept("program.pattern");
       String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       return executeUploadCommand(cmd);
+    } catch (RunnerException e) {
+      throw e;
     } catch (Exception e) {
       throw new RunnerException(e);
     }
@@ -287,6 +291,8 @@ public boolean burnBootloader() throws Exception {
       pattern = prefs.getOrExcept("bootloader.pattern");
       cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       return executeUploadCommand(cmd);
+    } catch (RunnerException e) {
+      throw e;
     } catch (Exception e) {
       throw new RunnerException(e);
     }

app/src/processing/app/Sketch.java

@@ -1692,11 +1692,6 @@ protected boolean upload(String buildPath, String suggestedClassName, boolean us
 
     BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
 
-    if (boardPort == null) {
-      editor.statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
-      return false;
-    }
-
     Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort);
 
     boolean success = false;