diff options
| author | Arnaud Simon <arnaudsimon@apache.org> | 2009-03-04 14:35:26 +0000 |
|---|---|---|
| committer | Arnaud Simon <arnaudsimon@apache.org> | 2009-03-04 14:35:26 +0000 |
| commit | d9489e40acd200bc36d3a638a51152021ac1e3aa (patch) | |
| tree | e971cd799603b9a9cbb243c52e339ee4319334d9 /qpid/java | |
| parent | 7845b55febcf6b9f783672dc5abd7815136564e2 (diff) | |
| download | qpid-python-d9489e40acd200bc36d3a638a51152021ac1e3aa.tar.gz | |
qpid-1712: changed default value for _cycleRetries to 1
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750025 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java index 7190344f59..c7d8c69fff 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java @@ -30,7 +30,7 @@ public class FailoverRoundRobinServers implements FailoverMethod private static final Logger _logger = LoggerFactory.getLogger(FailoverRoundRobinServers.class); /** The default number of times to cycle through all servers */ - public static final int DEFAULT_CYCLE_RETRIES = 0; + public static final int DEFAULT_CYCLE_RETRIES = 1; /** The default number of times to retry each server */ public static final int DEFAULT_SERVER_RETRIES = 0; @@ -66,6 +66,8 @@ public class FailoverRoundRobinServers implements FailoverMethod String cycleRetries = _connectionDetails.getFailoverOption(ConnectionURL.OPTIONS_FAILOVER_CYCLE); + _cycleRetries = DEFAULT_CYCLE_RETRIES; + if (cycleRetries != null) { try @@ -74,7 +76,7 @@ public class FailoverRoundRobinServers implements FailoverMethod } catch (NumberFormatException nfe) { - _cycleRetries = DEFAULT_CYCLE_RETRIES; + _logger.warn("Cannot set cycle Retries, " + cycleRetries + " is not a number. Using default: " + DEFAULT_CYCLE_RETRIES); } } @@ -93,8 +95,8 @@ public class FailoverRoundRobinServers implements FailoverMethod public boolean failoverAllowed() { - return ((_currentCycleRetries < _cycleRetries) || (_currentServerRetry < _serverRetries) - || (_currentBrokerIndex < (_connectionDetails.getBrokerCount() - 1))); + return ((_currentCycleRetries < _cycleRetries) || (_currentServerRetry < _serverRetries)); + //|| (_currentBrokerIndex <= (_connectionDetails.getBrokerCount() - 1))); } public void attainedConnection() |