From 7eff21c38b119354f8e4f658c8cfd25fe39812af Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 14 Oct 2008 11:48:43 +0000 Subject: [PATCH] 's auto-encoding-selection was broken. PR 42389. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@704486 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 4 ++++ src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 5c541f6ae..e6398ed94 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -240,6 +240,10 @@ Fixed bugs: breaks. Bugzilla Report 43342. + * encoding="auto" has been broken in since Ant 1.7.0 and only + worked if JavaMail was available. + Bugzilla Report 42389. + Other changes: -------------- 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 0a5c70ca1..ef6962aa7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -430,7 +430,6 @@ public class EmailTask extends Task { log("Using MIME mail", Project.MSG_VERBOSE); } catch (BuildException e) { logBuildException("Failed to initialise MIME mail: ", e); - return; } } // SMTP auth only allowed with MIME mail @@ -454,7 +453,6 @@ public class EmailTask extends Task { log("Using UU mail", Project.MSG_VERBOSE); } catch (BuildException e) { logBuildException("Failed to initialise UU mail: ", e); - return; } } // try plain format