You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/09/08 17:29:50 UTC
svn commit: r995094 - in
/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp:
SMTPConnection.java SMTPTransport.java
Author: rickmcguire
Date: Wed Sep 8 15:29:50 2010
New Revision: 995094
URL: http://svn.apache.org/viewvc?rev=995094&view=rev
Log:
GERONIMO-5587 SMTP is including bcc header in sent email
Modified:
geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java
geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java?rev=995094&r1=995093&r2=995094&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java Wed Sep 8 15:29:50 2010
@@ -504,7 +504,7 @@ public class SMTPConnection extends Mail
* is in the right place and ready for getting the DATA message and the data
* right place in the sequence
*/
- protected void sendData(Message msg) throws MessagingException {
+ protected void sendData(MimeMessage msg) throws MessagingException {
// send the DATA command
SMTPReply line = sendCommand("DATA");
@@ -531,7 +531,7 @@ public class SMTPConnection extends Mail
// writer.
MIMEOutputStream mimeOut = new MIMEOutputStream(outputStream);
- msg.writeTo(mimeOut);
+ msg.writeTo(mimeOut, new String[] {"Bcc", "Content-Length"});
// now to finish, we send a CRLF sequence, followed by a ".".
mimeOut.writeSMTPTerminator();
Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?rev=995094&r1=995093&r2=995094&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java Wed Sep 8 15:29:50 2010
@@ -346,7 +346,7 @@ public class SMTPTransport extends Trans
try {
// try to send the data
- connection.sendData(message);
+ connection.sendData((MimeMessage)message);
} catch (MessagingException e) {
// If there's an error at this point, this is a complete
// delivery failure.