Author: bodewig
Date: Sat Sep 21 12:34:17 2013
New Revision: 1525227
URL: http://svn.apache.org/r1525227
Log:
yet another attempt to get the mailport right with smtps. BZ 49267
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1525227&r1=1525226&r2=1525227&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Sep 21 12:34:17 2013
@@ -15,6 +15,9 @@ Fixed bugs:
interfere with each other.
Bugzilla Report 54393.
+ * <mail>'s mailport still didn't work proprly when using smtps.
+ Bugzilla Report 49267.
+
Other changes:
--------------
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java?rev=1525227&r1=1525226&r2=1525227&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
Sat Sep 21 12:34:17 2013
@@ -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));
}
