Author: davsclaus
Date: Sun Sep 25 17:34:19 2011
New Revision: 1175438
URL: http://svn.apache.org/viewvc?rev=1175438&view=rev
Log:
CAMEL-4486: Fixed issue with routing slip EIP not propagating failed to resolve
endpoint exception properly.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=1175438&r1=1175437&r2=1175438&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Sun Sep 25 17:34:19 2011
@@ -170,7 +170,7 @@ public class RoutingSlip extends Service
};
}
- private boolean doRoutingSlip(Exchange exchange, AsyncCallback callback) {
+ private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback
callback) {
Exchange current = exchange;
RoutingSlipIterator iter;
try {
@@ -196,8 +196,8 @@ public class RoutingSlip extends Service
}
} catch (Exception e) {
// error resolving endpoint so we should break out
- exchange.setException(e);
- return true;
+ current.setException(e);
+ break;
}
// prepare and process the routing slip
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java?rev=1175438&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
Sun Sep 25 17:34:19 2011
@@ -0,0 +1,85 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ *
+ */
+public class RoutingSlipNoSuchEndpointExceptionTest extends ContextTestSupport
{
+
+ public static class Router {
+ public String findEndpoint() {
+ return "unresolved:endpoint";
+ }
+ }
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testRoutingSlip() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .onException(Exception.class)
+ .to("mock:error")
+ .end()
+ .routingSlip(bean(Router.class));
+ }
+ });
+ context.start();
+
+ MockEndpoint endpoint = getMockEndpoint("mock:error");
+ endpoint.expectedMessageCount(1);
+
+ sendBody("direct:start", "Hello World!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRoutingSlipChild() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .onException(Exception.class)
+ .to("mock:error")
+ .end()
+ .to("direct:child");
+
+ from("direct:child")
+ .errorHandler(noErrorHandler())
+ .routingSlip(bean(Router.class));
+ }
+ });
+ context.start();
+
+ MockEndpoint endpoint = getMockEndpoint("mock:error");
+ endpoint.expectedMessageCount(1);
+
+ sendBody("direct:start", "Hello World!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
