rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-07 01:54:26 +01:00
Code Issues Releases Activity

Don't wrap a RunnerException in a redundant RunnerException.

Browse Source
This commit is contained in:
David A. Mellis 2014-06-11 12:21:52 -04:00
parent b5fe1b1eb5
commit fcd633686f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -121,6 +121,8 @@ public class SerialUploader extends Uploader {
String pattern = prefs.getOrExcept("upload.pattern"); String pattern = prefs.getOrExcept("upload.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true); String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
uploadResult = executeUploadCommand(cmd); uploadResult = executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }
@ -228,6 +230,8 @@ public class SerialUploader extends Uploader {
String pattern = prefs.getOrExcept("program.pattern"); String pattern = prefs.getOrExcept("program.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true); String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd); return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }
@ -287,6 +291,8 @@ public class SerialUploader extends Uploader {
pattern = prefs.getOrExcept("bootloader.pattern"); pattern = prefs.getOrExcept("bootloader.pattern");
cmd = StringReplacer.formatAndSplit(pattern, prefs, true); cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd); return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }