From 625eac73340790b47c5d3ae2c54a97b21a1997e9 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 21 Sep 2013 12:34:17 +0000 Subject: [PATCH] yet another attempt to get the mailport right with smtps. BZ 49267 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1525227 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/WHATSNEW b/WHATSNEW index 6314ee10b..749b7a509 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -15,6 +15,9 @@ Fixed bugs: interfere with each other. Bugzilla Report 54393. + * 's mailport still didn't work proprly when using smtps. + Bugzilla Report 49267. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index 85a022e4a..c231fc8fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -157,7 +157,9 @@ public class MimeMailer extends Mailer { // SMTP provider props.put("mail.smtp.socketFactory.class", SSL_FACTORY); props.put("mail.smtp.socketFactory.fallback", "false"); + props.put("mail.smtps.host", host); if (isPortExplicitlySpecified()) { + props.put("mail.smtps.port", String.valueOf(port)); props.put("mail.smtp.socketFactory.port", String.valueOf(port)); }