This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch camel-2.19.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.19.x by this push: new 2565f60 CAMEL-12069: ActiveMQ/JMS component: transferExchange option does not transfer exchange properties anymore (closes #2139) 2565f60 is described below commit 2565f60cf86b30e410a1aa70bd97ac4f73688846 Author: Pascal Schumacher <[hidden email]> AuthorDate: Wed Dec 6 20:58:02 2017 +0100 CAMEL-12069: ActiveMQ/JMS component: transferExchange option does not transfer exchange properties anymore (closes #2139) TransferExchange now includes exchange properties again. This restores the previous behavior accidentally broken by 5dd59162e4ac9335e497934b8d662f598cb779d1. # Conflicts: # components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java --- .../src/main/java/org/apache/camel/component/jms/JmsBinding.java | 2 +- .../org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java | 3 +++ .../java/org/apache/camel/component/jms/JmsTransferExchangeTest.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java index 871ef64..14174f6 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java @@ -467,7 +467,7 @@ public class JmsBinding { // special for transferExchange if (endpoint != null && endpoint.isTransferExchange()) { LOG.trace("Option transferExchange=true so we use JmsMessageType: Object"); - Serializable holder = DefaultExchangeHolder.marshal(exchange, false, endpoint.isAllowSerializedHeaders()); + Serializable holder = DefaultExchangeHolder.marshal(exchange, true, endpoint.isAllowSerializedHeaders()); Message answer = session.createObjectMessage(holder); // ensure default delivery mode is used by default answer.setJMSDeliveryMode(Message.DEFAULT_DELIVERY_MODE); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java index 01d1697..1b3dda3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java @@ -66,6 +66,8 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport { map.put("double", new Double(1.23)); exchange.getIn().setHeaders(map); + + exchange.setProperty("PropertyName", "PropertyValue"); } }); @@ -85,6 +87,7 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport { assertEquals((Long) 123L, resultMessage.getHeader("long", Long.class)); assertEquals((Double) 1.23, resultMessage.getHeader("double", Double.class)); assertEquals("hello", resultMessage.getHeader("string", String.class)); + assertEquals("PropertyValue", exchange.getProperty("PropertyName")); } @Override diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java index 71d25e8..1aa1572 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java @@ -62,6 +62,7 @@ public class JmsTransferExchangeTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); mock.expectedHeaderReceived("foo", "cheese"); + mock.expectedPropertyReceived("bar", 123); template.send("direct:start", new Processor() { public void process(Exchange exchange) throws Exception { -- To stop receiving notification emails like this one, please contact ['"[hidden email]" <[hidden email]>']. |
Free forum by Nabble | Edit this page |