Author: norman
Date: Sat Oct 9 13:06:51 2010
New Revision: 1006150
URL: http://svn.apache.org/viewvc?rev=1006150&view=rev
Log:
Workaround for altering message-id (JAMES-1010 and JAMES-875)
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=1006150&r1=1006149&r2=1006150&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Sat Oct 9 13:06:51 2010
@@ -155,6 +155,18 @@ public class MimeMessageWrapper
}
/**
+ * Overrides default javamail behaviour by not altering the Message-ID by
+ * default. Ê Ê
+ * Ê Ê
+ * @see JAMES-875 / JAMES-1010
+ * @see javax.mail.internet.MimeMessage#updateMessageID()
+ */
+ protected void updateMessageID() throws MessagingException {
+ if (getMessageID() == null)
+ super.updateMessageID();
+ }
+
+ /**
* Returns the source ID of the MimeMessageSource that is supplying this
* with data.
* @see MimeMessageSource
@@ -458,8 +470,10 @@ public class MimeMessageWrapper
super.setDataHandler(arg0);
}
- /**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.lifecycle.Disposable#dispose()
*/
public void dispose() {
if (sourceIn != null) {
@@ -500,7 +514,7 @@ public class MimeMessageWrapper
* future JavaMail. But if there are other Return-Path header
* values, let's drop our placeholder.
- MailHeaders newHeaders = new MailHeaders(new
ByteArrayInputStream((RFC2822Headers.RETURN_PATH + ":
placeholder").getBytes()));
+ MailHeaders newHeaders = new MailHeaders(new
ByteArrayInputStream((f.RETURN_PATH + ": placeholder").getBytes()));
newHeaders.setHeader(RFC2822Headers.RETURN_PATH, null);
newHeaders.load(is);
String[] returnPathHeaders =
newHeaders.getHeader(RFC2822Headers.RETURN_PATH);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
