Author: davsclaus
Date: Tue Jun 12 13:31:02 2012
New Revision: 1349330
URL: http://svn.apache.org/viewvc?rev=1349330&view=rev
Log:
CAMEL-5363: Fixed jms producer to trigger Camel error handling if invalid
destination during destination resolution failed.
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1349330&r1=1349329&r2=1349330&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Tue Jun 12 13:31:02 2012
@@ -123,12 +123,20 @@ public class JmsProducer extends Default
return true;
}
- if (!endpoint.isDisableReplyTo() &&
exchange.getPattern().isOutCapable()) {
- // in out requires a bit more work than in only
- return processInOut(exchange, callback);
- } else {
- // in only
- return processInOnly(exchange, callback);
+ try {
+ if (!endpoint.isDisableReplyTo() &&
exchange.getPattern().isOutCapable()) {
+ // in out requires a bit more work than in only
+ return processInOut(exchange, callback);
+ } else {
+ // in only
+ return processInOnly(exchange, callback);
+ }
+ } catch (Throwable e) {
+ // must catch exception to ensure callback is invoked as expected
+ // to let Camel error handling deal with this
+ exchange.setException(e);
+ callback.done(true);
+ return true;
}
}
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java?rev=1349330&view=auto
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
(added)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
Tue Jun 12 13:31:02 2012
@@ -0,0 +1,82 @@
+/**
+ * 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 javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Session;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+import
org.springframework.jms.support.destination.DestinationResolutionException;
+import org.springframework.jms.support.destination.DestinationResolver;
+
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+/**
+ *
+ */
+public class JmsInOnlyInvalidDestinationTest extends CamelTestSupport {
+
+ @Test
+ public void testInvalidDestination() throws Exception {
+ getMockEndpoint("mock:dead").expectedMessageCount(1);
+
+ template.sendBodyAndHeader("direct:foo", "Hello World", "foo",
"activemq:queue:foo?destinationResolver=#myResolver");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myResolver", new MyDestinationResolver());
+ return jndi;
+ }
+
+ 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 {
+
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1));
+
+ from("direct:foo")
+ .recipientList(header("foo"));
+ }
+ };
+ }
+
+ private static class MyDestinationResolver implements DestinationResolver {
+
+ @Override
+ public Destination resolveDestinationName(Session session, String
destinationName, boolean pubSubDomain) throws JMSException {
+ throw new DestinationResolutionException("Forced");
+ }
+ }
+}
