You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/02/26 18:01:25 UTC
[cxf] 03/06: [CXF-7522] Only do the exponential backoff if that is
the algorithm selected (the default)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2ac7cf87f4ebe87fd2390a02c2a64e347149639a
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:12:56 2018 -0500
[CXF-7522] Only do the exponential backoff if that is the algorithm selected (the default)
(cherry picked from commit 7d8fe7b4a95748d8cad3c3ce2089cd6efa902e61)
---
.../main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
index e2ff271..c5d8ca2 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
@@ -418,7 +418,11 @@ public class RedeliveryQueueImpl implements RedeliveryQueue {
if (null != rmrp && rmrp.getInterval() > 0L) {
baseRedeliveryInterval = rmrp.getInterval();
}
- backoff = RedeliveryQueue.DEFAULT_EXPONENTIAL_BACKOFF;
+ if (rmrp == null || "ExponentialBackoff".equals(rmrp.getAlgorithm())) {
+ backoff = RedeliveryQueue.DEFAULT_EXPONENTIAL_BACKOFF;
+ } else {
+ backoff = 1;
+ }
next = new Date(System.currentTimeMillis() + baseRedeliveryInterval);
nextInterval = baseRedeliveryInterval * backoff;
maxRetries = null != rmrp ? rmrp.getMaxRetries() : 0;
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.