From fcd633686f75896ac6a14765184af3f5b40a2634 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Wed, 11 Jun 2014 12:21:52 -0400 Subject: [PATCH] Don't wrap a RunnerException in a redundant RunnerException. --- app/src/cc/arduino/packages/uploaders/SerialUploader.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/cc/arduino/packages/uploaders/SerialUploader.java b/app/src/cc/arduino/packages/uploaders/SerialUploader.java index 5cc67afb0..eb1ea96e8 100644 --- a/app/src/cc/arduino/packages/uploaders/SerialUploader.java +++ b/app/src/cc/arduino/packages/uploaders/SerialUploader.java @@ -121,6 +121,8 @@ public class SerialUploader extends Uploader { 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 class SerialUploader extends Uploader { 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 class SerialUploader extends Uploader { 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); }