Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regression with DiscoveryTransportNoBrokerTest - https://issues.apache.org/jira/browse/AMQ-3049 - reconnectDelay of -1 not appropriate for sleep 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1044340 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-12-10 13:07:00 +00:00
parent 08a2967764
commit 6ed942a3ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -70,7 +70,7 @@ import org.apache.commons.logging.LogFactory;
public class FailoverTransport implements CompositeTransport {
private static final Log LOG = LogFactory.getLog(FailoverTransport.class);
private static final int DEFAULT_INITIAL_RECONNECT_DELAY = 10;
private TransportListener transportListener;
private boolean disposed;
private boolean connected;
@ -90,7 +90,7 @@ public class FailoverTransport implements CompositeTransport {
private final TaskRunner reconnectTask;
private boolean started;
private boolean initialized;
private long initialReconnectDelay = 10;
private long initialReconnectDelay = DEFAULT_INITIAL_RECONNECT_DELAY;
private long maxReconnectDelay = 1000 * 30;
private double backOffMultiplier = 2d;
private long timeout = -1;
@ -99,7 +99,7 @@ public class FailoverTransport implements CompositeTransport {
private int maxReconnectAttempts;
private int startupMaxReconnectAttempts;
private int connectFailures;
private long reconnectDelay = -1;
private long reconnectDelay = DEFAULT_INITIAL_RECONNECT_DELAY;
private Exception connectionFailure;
private boolean firstConnection = true;
// optionally always have a backup created
@ -805,7 +805,7 @@ public class FailoverTransport implements CompositeTransport {
if (connectList.isEmpty()) {
failure = new IOException("No uris available to connect to.");
} else {
if (!useExponentialBackOff || reconnectDelay == -1) {
if (!useExponentialBackOff || reconnectDelay == DEFAULT_INITIAL_RECONNECT_DELAY) {
reconnectDelay = initialReconnectDelay;
}
synchronized (backupMutex) {