Author: davsclaus
Date: Wed Sep 5 13:51:57 2012
New Revision: 1381184
URL: http://svn.apache.org/viewvc?rev=1381184&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/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
- copied unchanged from r1381183,
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1381182
Merged /camel/branches/camel-2.10.x:r1381183
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1381184&r1=1381183&r2=1381184&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
Wed Sep 5 13:51:57 2012
@@ -145,7 +145,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
