Author: bago
Date: Thu Mar 31 08:50:37 2011
New Revision: 1087218
URL: http://svn.apache.org/viewvc?rev=1087218&view=rev
Log:
Fix behaviour with latest mime4j trunk. Felix change did fix build error
(against latest mime4j trunk) but introduced behaviour issues.
With current mime4j trunk we are forced to check "private" implementation
details: MessageBuilderImpl. Maybe the 2 methods (setFlatMode and
setContentDecoding) should be moved to the MessageBuilder interface?
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1087218&r1=1087217&r2=1087218&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
Thu Mar 31 08:50:37 2011
@@ -33,6 +33,7 @@ import org.apache.james.mime4j.dom.Messa
import org.apache.james.mime4j.dom.SingleBody;
import org.apache.james.mime4j.dom.field.Field;
import org.apache.james.mime4j.io.EOLConvertingInputStream;
+import org.apache.james.mime4j.message.MessageBuilderImpl;
import org.apache.james.mime4j.stream.MimeEntityConfig;
/**
@@ -55,6 +56,11 @@ public class Message implements Headers
*/
public Message(InputStream is) throws IOException, MimeException {
MessageBuilder mb = newMessageBuilder();
+
+ if (mb instanceof MessageBuilderImpl) {
+ ((MessageBuilderImpl) mb).setFlatMode(true);
+ ((MessageBuilderImpl) mb).setContentDecoding(false);
+ }
org.apache.james.mime4j.dom.Message mImpl = mb.parse(new
EOLConvertingInputStream(is));
this.message = mImpl;
@@ -63,13 +69,12 @@ public class Message implements Headers
private MessageBuilder newMessageBuilder() throws MimeException {
MimeEntityConfig mec = new MimeEntityConfig();
mec.setMaxLineLen(10000);
-
+ mec.setMaxHeaderLen(30000);
+
MessageServiceFactory mbf = MessageServiceFactory.newInstance();
mbf.setAttribute("MimeEntityConfig", mec);
// mbf.setProperty("MaxLineLength", 10000);
MessageBuilder mb = mbf.newMessageBuilder();
- // mb.setContentDecoding(false);
- // mb.setFlatMode();
return mb;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
