From 87735bb88e05d31b68122612099bc86f21ee79b8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 29 Sep 2023 10:27:09 -0700 Subject: [PATCH] Reverted sign exception modifications --- src/main/java/rife/bld/operations/PublishOperation.java | 4 ++-- .../rife/bld/operations/exceptions/SignException.java | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/rife/bld/operations/PublishOperation.java b/src/main/java/rife/bld/operations/PublishOperation.java index 2f9e155..9385fb9 100644 --- a/src/main/java/rife/bld/operations/PublishOperation.java +++ b/src/main/java/rife/bld/operations/PublishOperation.java @@ -348,12 +348,12 @@ public class PublishOperation extends AbstractOperation { try { process.waitFor(); } catch (InterruptedException e) { - throw new SignException(file, new InterruptedException(e.getMessage())); + throw new SignException(file, e.getMessage()); } if (process.exitValue() != 0) { var error = FileUtils.readString(process.getErrorStream()); - throw new SignException(file, new IOException(error)); + throw new SignException(file, error); } return FileUtils.readString(process.getInputStream()); } diff --git a/src/main/java/rife/bld/operations/exceptions/SignException.java b/src/main/java/rife/bld/operations/exceptions/SignException.java index d921c19..eab071d 100644 --- a/src/main/java/rife/bld/operations/exceptions/SignException.java +++ b/src/main/java/rife/bld/operations/exceptions/SignException.java @@ -19,12 +19,10 @@ public class SignException extends RuntimeException { private final File file_; private final String reason_; - public SignException(File file, Throwable reason) { - super("An error occurred while signing '" + file, reason); + public SignException(File file, String reason) { + super("An error occurred while signing '" + file + "':\n" + reason); file_ = file; - if (reason.getCause() != null && reason.getCause().getMessage() != null) - reason_ = reason.getCause().getMessage(); - else reason_ = ""; + reason_ = reason; } public File getFile() {