Author: olegk
Date: Sat Nov 1 11:21:39 2014
New Revision: 1635924
URL: http://svn.apache.org/r1635924
Log:
BasicBodyFactory to use strict mode when used by message builder to parse
messages in strict mode
Modified:
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageBuilder.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
james/mime4j/trunk/dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java
Modified:
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageBuilder.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageBuilder.java?rev=1635924&r1=1635923&r2=1635924&view=diff
==============================================================================
---
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageBuilder.java
(original)
+++
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageBuilder.java
Sat Nov 1 11:21:39 2014
@@ -302,7 +302,7 @@ public class DefaultMessageBuilder imple
BodyDescriptorBuilder bdb = bodyDescBuilder != null ?
bodyDescBuilder :
new DefaultBodyDescriptorBuilder(null, fieldParser != null ?
fieldParser :
strict ? DefaultFieldParser.getParser() :
LenientFieldParser.getParser(), mon);
- BodyFactory bf = bodyFactory != null ? bodyFactory : new
BasicBodyFactory();
+ BodyFactory bf = bodyFactory != null ? bodyFactory : new
BasicBodyFactory(!strict);
MimeStreamParser parser = new MimeStreamParser(cfg, mon, bdb);
parser.setContentHandler(new ParserStreamContentHandler(message,
bf));
parser.setContentDecoding(contentDecoding);
Modified:
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java?rev=1635924&r1=1635923&r2=1635924&view=diff
==============================================================================
---
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
(original)
+++
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
Sat Nov 1 11:21:39 2014
@@ -898,7 +898,7 @@ public class MessageBuilder extends Abst
BodyDescriptorBuilder currentBodyDescBuilder = bodyDescBuilder != null
? bodyDescBuilder :
new DefaultBodyDescriptorBuilder(null, fieldParser != null ?
fieldParser :
strict ? DefaultFieldParser.getParser() :
LenientFieldParser.getParser(), currentMonitor);
- BodyFactory currentBodyFactory = bodyFactory != null ? bodyFactory :
new BasicBodyFactory();
+ BodyFactory currentBodyFactory = bodyFactory != null ? bodyFactory :
new BasicBodyFactory(!strict);
MimeStreamParser parser = new MimeStreamParser(currentConfig,
currentMonitor, currentBodyDescBuilder);
Message message = new MessageImpl();
Modified:
james/mime4j/trunk/dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java?rev=1635924&r1=1635923&r2=1635924&view=diff
==============================================================================
---
james/mime4j/trunk/dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java
(original)
+++
james/mime4j/trunk/dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java
Sat Nov 1 11:21:39 2014
@@ -99,7 +99,7 @@ public class MessageCharsetLenientTest {
// test in bosh states
for (boolean lenient : lenientstates) {
// set how lenient we are
- BasicBodyFactory basicBodyFactory = new
BasicBodyFactory(lenient );
+ BasicBodyFactory basicBodyFactory = new
BasicBodyFactory(lenient);
builder.setBodyFactory(basicBodyFactory);
// check the list of invalid Charsets
for (String invalidCharset : invalidCharsets) {
