Author: davsclaus
Date: Wed Jun 20 07:53:31 2012
New Revision: 1351972
URL: http://svn.apache.org/viewvc?rev=1351972&view=rev
Log:
CAMEL-5381: Fixed headers not propagated, due copyFrom should check if trying
to copy itself.
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
(with props)
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1351972&r1=1351971&r2=1351972&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Wed Jun 20 07:53:31 2012
@@ -61,6 +61,11 @@ public class JmsMessage extends DefaultM
@Override
public void copyFrom(org.apache.camel.Message that) {
+ if (that == this) {
+ // the same instance so do not need to copy
+ return;
+ }
+
// must initialize headers before we set the JmsMessage to avoid Camel
// populating it before we do the copy
getHeaders().clear();
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java?rev=1351972&view=auto
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
(added)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
Wed Jun 20 07:53:31 2012
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.issues;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Header;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.CamelJmsTestHelper;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+/**
+ *
+ */
+public class DynamicRoutersWithJMSMessageLostHeadersIssueTest extends
CamelTestSupport {
+
+ @Override
+ public void setUp() throws Exception {
+ deleteDirectory("target/inbox");
+ deleteDirectory("target/outbox");
+ super.setUp();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
+ camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
+
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("activemq:queue1")
+ .setHeader("HEADER1", constant("header1"))
+ .dynamicRouter(method(DynamicRouter.class,
"dynamicRoute"))
+ .to("mock:checkHeader");
+
+ from("direct:foo")
+ .setHeader("HEADER1", constant("header1"))
+ .dynamicRouter(method(DynamicRouter.class,
"dynamicRoute"))
+ .to("mock:checkHeader");
+ }
+ };
+ }
+
+ @Test
+ public void testHeaderShouldExisted() throws InterruptedException {
+ // direct
+ getMockEndpoint("mock:checkHeader").expectedMessageCount(1);
+ getMockEndpoint("mock:checkHeader").expectedHeaderReceived("HEADER1",
"header1");
+
+ template.sendBody("direct:foo", "A");
+
+ assertMockEndpointsSatisfied();
+ resetMocks();
+
+ // actvivemq
+ getMockEndpoint("mock:checkHeader").expectedMessageCount(1);
+ getMockEndpoint("mock:checkHeader").expectedHeaderReceived("HEADER1",
"header1");
+
+ template.sendBody("activemq:queue1", "A");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public static class DynamicRouter {
+
+ public String dynamicRoute(Exchange exchange,
@Header(Exchange.SLIP_ENDPOINT) String previous) {
+ if (previous == null) {
+ return "file://target/outbox";
+ } else {
+ //end slip
+ return null;
+ }
+ }
+
+ }
+}
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
