From 5960588d5e0694056723e46c0fd084405c68dbc1 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 May 2008 11:04:06 +0000 Subject: 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/qpid@653421 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/jms/failover/FailoverSingleServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'java/client') diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java index b1bc3cee96..9fa006233b 100644 --- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java +++ b/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; } -- cgit v1.2.1