Author: davsclaus
Date: Wed Sep 5 13:47:17 2012
New Revision: 1381182
URL: http://svn.apache.org/viewvc?rev=1381182&view=rev
Log:
CAMEL-5570: Fixed issue with onException and using -1 for maximumRedelivieries
may cause side effect on other onException. Thanks to Øyvind Ingebrigtsen
Øvergaard for the patch.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1381182&r1=1381181&r2=1381182&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
Wed Sep 5 13:47:17 2012
@@ -144,7 +144,7 @@ public class OnExceptionDefinition exten
return CamelContextHelper.mandatoryLookup(context,
redeliveryPolicyRef, RedeliveryPolicy.class);
} else if (redeliveryPolicy != null) {
return redeliveryPolicy.createRedeliveryPolicy(context,
parentPolicy);
- } else if (!outputs.isEmpty() && parentPolicy.getMaximumRedeliveries()
> 0) {
+ } else if (!outputs.isEmpty() && parentPolicy.getMaximumRedeliveries()
!= 0) {
// if we have outputs, then do not inherit parent
maximumRedeliveries
// as you would have to explicit configure maximumRedeliveries on
this onException to use it
// this is the behavior Camel has always had
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java?rev=1381182&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
Wed Sep 5 13:47:17 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest extends
ContextTestSupport {
+
+ private class FirstException extends Exception {
+ }
+
+ private class SecondException extends Exception {
+ }
+
+ private class ExceptionThrowingProcessor implements Processor {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String camelRedeliveryCounter =
exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER, String.class);
+ int redeliveries = camelRedeliveryCounter == null ? 0 :
Integer.valueOf(camelRedeliveryCounter);
+ switch (redeliveries) {
+ case 0:
+ throw new FirstException();
+ case 1:
+ throw new SecondException();
+ default:
+ break; // no-op
+ }
+ }
+ }
+ public void testMessageShouldGoToError() throws Exception {
+ String msg = "payload";
+
+ getMockEndpoint("mock:destination").expectedMessageCount(0);
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+ getMockEndpoint("mock:error").expectedBodiesReceived(msg);
+
+ template.sendBody("direct:source", msg);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:source")
+ .onException(FirstException.class)
+ .maximumRedeliveries(-1)
+ .handled(true)
+ .end()
+ .onException(SecondException.class)
+ .handled(true)
+ .to("mock:error")
+ .end()
+ .process(new ExceptionThrowingProcessor())
+ .to("mock:destination");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
