Author: davsclaus
Date: Tue Apr 26 12:10:10 2011
New Revision: 1096736
URL: http://svn.apache.org/viewvc?rev=1096736&view=rev
Log:
CAMEL-3902: Fixed JmsMessage copyFrom not propagating fault flag.
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.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=1096736&r1=1096735&r2=1096736&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
Tue Apr 26 12:10:10 2011
@@ -69,13 +69,23 @@ public class JmsMessage extends DefaultM
copyMessageId = false;
}
}
-
if (copyMessageId) {
setMessageId(that.getMessageId());
}
+
+ // copy body and fault flag
setBody(that.getBody());
- getHeaders().putAll(that.getHeaders());
- getAttachments().putAll(that.getAttachments());
+ setFault(that.isFault());
+
+ // we have already cleared the headers
+ if (that.hasHeaders()) {
+ getHeaders().putAll(that.getHeaders());
+ }
+
+ getAttachments().clear();
+ if (that.hasAttachments()) {
+ getAttachments().putAll(that.getAttachments());
+ }
}
/**
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java?rev=1096736&view=auto
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java
(added)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java
Tue Apr 26 12:10:10 2011
@@ -0,0 +1,86 @@
+/**
+ * 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;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+/**
+ * Tests that setting a fault body after doing JMS works. Because JmsMessage
has an
+ * JMS specific copyFrom method being used.
+ */
+public class SetFaultBodyAfterJmsRequestReplyIssueTest extends
CamelTestSupport {
+
+ @Test
+ public void testFault() throws Exception {
+ Exchange out = template.request("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello World");
+ }
+ });
+
+ assertNotNull(out);
+ assertEquals(true, out.isFailed());
+ assertEquals(true, out.hasOut());
+ assertEquals(true, out.getOut().isFault());
+ assertEquals("OnException", out.getOut().getBody());
+ }
+
+ 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 {
+ onException(IllegalArgumentException.class)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ exchange.getOut().setBody("OnException");
+ exchange.getOut().setFault(true);
+ }
+ });
+
+ from("direct:start")
+ .inOut("activemq:queue:foo")
+ .throwException(new IllegalArgumentException("Forced"));
+
+ from("activemq:queue:foo")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ exchange.getOut().setBody("Bye World");
+ }
+ });
+ }
+ };
+ }
+
+}
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SetFaultBodyAfterJmsRequestReplyIssueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
