QPID-895 : Patch provided provided by Senaka to prevent delay on initial Connections with SingleServer methods. Updated FailoverMethodTest to include a better description of where the times come from. Also added a maximum time test to ensure that we don't miss any regression of this patch.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@653421 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
index b1bc3cee96..9fa006233b 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
@@ -95,7 +95,7 @@ public class FailoverSingleServer implements FailoverMethod
 
 
         String delayStr = _brokerDetail.getProperty(BrokerDetails.OPTIONS_CONNECT_DELAY);
-        if (delayStr != null && _currentRetries != 1)
+        if (delayStr != null && _currentRetries > 0)
         {
             Long delay = Long.parseLong(delayStr);
             _logger.info("Delay between connect retries:" + delay);
@@ -106,10 +106,13 @@ public class FailoverSingleServer implements FailoverMethod
             }
             catch (InterruptedException ie)
             {
-                _logger.info("No delay between connect retries, use tcp://host:port?connectdelay='value' to enable.");
                 return null;
             }
         }
+        else
+        {
+            _logger.info("No delay between connect retries, use tcp://host:port?connectdelay='value' to enable.");
+        }
 
         return _brokerDetail;
     }