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

[da...@apache.org]

Author: davsclaus
Date: Thu Nov 19 05:44:35 2009
New Revision: 882050

URL: http://svn.apache.org/viewvc?rev=882050&view=rev
Log:
CAMEL-2201: Fixed setting redeliveryDelay not having to also set maxDelay in case the delay was higher than max.

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=882050&r1=882049&r2=882050&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 19 05:44:35 2009
@@ -331,6 +331,10 @@
      */
     public void setRedeliverDelay(long redeliverDelay) {
         this.redeliverDelay = redeliverDelay;
+        // if max enabled then also set max to this value in case max was too low
+        if (maximumRedeliveryDelay > 0 && redeliverDelay > maximumRedeliveryDelay) {
+            this.maximumRedeliveryDelay = redeliverDelay;
+        }
     }
 
     public double getBackOffMultiplier() {
@@ -386,7 +390,7 @@
     }
 
     /**
-     * Sets the maximum redelivery delay if using exponential back off.
+     * Sets the maximum redelivery delay.
      * Use -1 if you wish to have no maximum
      */
     public void setMaximumRedeliveryDelay(long maximumRedeliveryDelay) {