From 39e2e62655e6ad95be0e8f6e9ca1d52cd5b50f9d Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Wed, 23 Nov 2005 20:08:47 +0000 Subject: [PATCH] EmailTask was eating SMTP error messages. Bugzilla report 37547. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@348538 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index c0bf7ddaa..66bf5963b 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -161,6 +161,8 @@ Fixed bugs: * > 1 ssh invocations to a given host would fail. Bugzilla report 36207. +* EmailTask was eating SMTP error messages. Bugzilla report 37547. + Other changes: -------------- * New task converts a path into a property diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index c17855705..c5971481a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -529,12 +529,13 @@ public class EmailTask extends Task { log("Sent email with " + count + " attachment" + (count == 1 ? "" : "s"), Project.MSG_INFO); } catch (BuildException e) { - log("Failed to send email", Project.MSG_WARN); + Throwable t = e.getCause() == null ? e : e.getCause(); + log("Failed to send email: " + t.getMessage(), Project.MSG_WARN); if (failOnError) { throw e; } } catch (Exception e) { - log("Failed to send email", Project.MSG_WARN); + log("Failed to send email: " + e.getMessage(), Project.MSG_WARN); if (failOnError) { throw new BuildException(e); }