You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by da...@apache.org on 2010/11/18 11:08:10 UTC

svn commit: r1036381 - /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java

Author: davsclaus
Date: Thu Nov 18 10:08:10 2010
New Revision: 1036381

URL: http://svn.apache.org/viewvc?rev=1036381&view=rev
Log:
CAMEL-3344: Fixed issue with calculating redelivery delay may exceeding max delay setting.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=1036381&r1=1036380&r2=1036381&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Thu Nov 18 10:08:10 2010
@@ -220,7 +220,8 @@ public class RedeliveryPolicy implements
             redeliveryDelayResult += redeliveryDelayResult * variance;
         }
 
-        if (maximumRedeliveryDelay > 0 && redeliveryDelay > maximumRedeliveryDelay) {
+        // ensure the calculated result is not bigger than the max delay (if configured)
+        if (maximumRedeliveryDelay > 0 && redeliveryDelayResult > maximumRedeliveryDelay) {
             redeliveryDelayResult = maximumRedeliveryDelay;
         }