https://issues.apache.org/jira/browse/AMQ-6273

increment the connect attempt count explicitly to ensure reconnect policy options are applied.
fenglove · Jul 19, 2016 · e05db7c · e05db7c
1 parent 39184e2
commit e05db7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
@@ -593,7 +593,9 @@ private void doInitializeConnection(boolean local) throws Exception {
         do {
             if (attempt > 0) {
                 try {
-                    Thread.sleep(policy.getNextDelay(attempt));
+                    long nextDelay = policy.getNextDelay(attempt);
+                    LOG.debug("Bridge reconnect attempt {} waiting {}ms before next attempt.", attempt, nextDelay);
+                    Thread.sleep(nextDelay);
                 } catch(InterruptedException e) {
                 }
             }
@@ -625,9 +627,11 @@ private void doInitializeConnection(boolean local) throws Exception {
                 return;
             } catch(Exception e) {
                 LOG.debug("Failed to establish initial {} connection for JmsConnector [{}]", new Object[]{ (local ? "local" : "foreign"), attempt }, e);
+            } finally {
+                attempt++;
             }
         }
-        while ((maxRetries == INFINITE || maxRetries > ++attempt) && !connectionService.isShutdown());
+        while ((maxRetries == INFINITE || maxRetries > attempt) && !connectionService.isShutdown());
 
         this.failed.set(true);
     }

diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/ReconnectionPolicy.java
@@ -234,7 +234,7 @@ public long getNextDelay(int attempt) {
         long nextDelay = initialReconnectDelay;
 
         if (useExponentialBackOff) {
-            nextDelay = nextDelay * (long)(attempt * backOffMultiplier);
+            nextDelay = Math.max(initialReconnectDelay, nextDelay * (long)((attempt - 1) * backOffMultiplier));
         }
 
         if (maximumReconnectDelay > 0 && nextDelay > maximumReconnectDelay) {