Author: dkulp
Date: Fri Jul 8 20:25:54 2011
New Revision: 1144490
URL: http://svn.apache.org/viewvc?rev=1144490&view=rev
Log:
Merged revisions 1142654 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1142654 | cschneider | 2011-07-04 09:25:16 -0400 (Mon, 04 Jul 2011) | 1 line
CAMEL-4173 Fixed Nullpointer Exception when sending null body, added test,
removed 2 unused imports
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:25:54 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100711,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1132961,1134252,1134260,1134404,1134501,1134626,1134681,1134714-1134911,1135223,1135364,1136065,1136290,1138285,1139163,1139749,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100711,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1132961,1134252,1134260,1134404,1134501,1134626,1134681,1134714-1134911,1135223,1135364,1136065,1136290,1138285,1139163,1139749,1140096-1140102,1141783,1142654,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1144490&r1=1144489&r2=1144490&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
Fri Jul 8 20:25:54 2011
@@ -188,9 +188,14 @@ public class MailBinding {
if (LOG.isTraceEnabled()) {
LOG.trace("Using Content-Type " + contentType + " for MimeMessage:
" + part);
}
+
+ String body = exchange.getIn().getBody(String.class);
+ if (body == null) {
+ body = "";
+ }
// always store content in a byte array data store to avoid various
content type and charset issues
- DataSource ds = new
ByteArrayDataSource(exchange.getIn().getBody(String.class), contentType);
+ DataSource ds = new ByteArrayDataSource(body, contentType);
part.setDataHandler(new DataHandler(ds));
// set the content type header afterwards
Modified:
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java?rev=1144490&r1=1144489&r2=1144490&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
Fri Jul 8 20:25:54 2011
@@ -17,7 +17,6 @@
package org.apache.camel.component.mail;
import org.apache.camel.Exchange;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.ExchangeTestSupport;
import org.junit.Test;
Modified:
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java?rev=1144490&r1=1144489&r2=1144490&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
Fri Jul 8 20:25:54 2011
@@ -56,6 +56,18 @@ public class MailCustomContentTypeTest e
assertEquals("text/html; charset=iso-8859-1", msg.getContentType());
assertEquals("<html><body><h1>Hello</h1>World</body></html>",
msg.getContent());
}
+
+ @Test
+ public void testNullBody() throws Exception {
+ Mailbox.clearAll();
+
+ template.sendBodyAndHeader("direct:b", null, "contentType",
"text/plain; charset=iso-8859-1");
+
+ Mailbox box = Mailbox.get("claus@localhost");
+ Message msg = box.get(0);
+ assertEquals("text/plain; charset=iso-8859-1", msg.getContentType());
+ assertEquals("", msg.getContent());
+ }
@Test
public void testSendPlainMailContentTypeInHeader() throws Exception {
Modified:
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java?rev=1144490&r1=1144489&r2=1144490&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
Fri Jul 8 20:25:54 2011
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
