Author: dkulp
Date: Fri Jul 8 19:22:07 2011
New Revision: 1144429
URL: http://svn.apache.org/viewvc?rev=1144429&view=rev
Log:
Merged revisions 1085549 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1085549 | davsclaus | 2011-03-25 16:26:48 -0400 (Fri, 25 Mar 2011) | 1 line
CAMEL-3805: Fixed JmsMessage not re-installing underlying javax.jms.Message
if body was set to null.
........
Added:
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
- copied unchanged from r1085549,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:22:07 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085549,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Modified:
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1144429&r1=1144428&r2=1144429&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Fri Jul 8 19:22:07 2011
@@ -107,6 +107,17 @@ public class JmsMessage extends DefaultM
this.jmsMessage = jmsMessage;
}
+ @Override
+ public void setBody(Object body) {
+ super.setBody(body);
+ if (body == null) {
+ // preserver headers even if we set body to null
+ ensureInitialHeaders();
+ // remove underlying jmsMessage since we mutated body to null
+ jmsMessage = null;
+ }
+ }
+
public Object getHeader(String name) {
Object answer = null;
Modified:
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java?rev=1144429&r1=1144428&r2=1144429&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
Fri Jul 8 19:22:07 2011
@@ -36,7 +36,7 @@ public class JmsMutateMessageTest extend
private String uri = "activemq:queue:hello";
- public void testMuateMessage() throws Exception {
+ public void testMutateMessage() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isEqualTo("Hello World");
Modified:
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java?rev=1144429&r1=1144428&r2=1144429&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
Fri Jul 8 19:22:07 2011
@@ -36,7 +36,7 @@ public class JmsMutateRemoveHeaderMessag
private String uri = "activemq:queue:hello";
- public void testMuateMessage() throws Exception {
+ public void testMutateMessage() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isEqualTo("Hello World");
