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

https://issues.apache.org/jira/browse/AMQ-5241 - track window between sending shutdown info and doing local close to avoid race with broker on normal connection.close - needs two jvm to reliably reproduce so no unit test with the fix

This commit is contained in:
gtully 2014-06-23 12:12:39 +01:00
parent 8824ac9fcb
commit ce911bafbf
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -128,6 +128,7 @@ public class FailoverTransport implements CompositeTransport {
private final ArrayList<URI> priorityList = new ArrayList<URI>();
private boolean priorityBackupAvailable = false;
private String nestedExtraQueryOptions;
private boolean shuttingDown = false;
public FailoverTransport() throws InterruptedIOException {
brokerSslContext = SslContext.getCurrentSslContext();
@ -242,6 +243,12 @@ public class FailoverTransport implements CompositeTransport {
public final void handleTransportFailure(IOException e) throws InterruptedException {
synchronized (reconnectMutex) {
if (shuttingDown) {
// shutdown info sent and remote socket closed and we see that before a local close
// let the close do the work
return;
}
if (LOG.isTraceEnabled()) {
LOG.trace(this + " handleTransportFailure: " + e, e);
}
@ -257,7 +264,7 @@ public class FailoverTransport implements CompositeTransport {
if (canReconnect()) {
reconnectOk = true;
}
LOG.warn("Transport (" + transport + ") failed, reason: "
LOG.warn("Transport (" + transport + ") failed"
+ (reconnectOk ? "," : ", not") + " attempting to automatically reconnect", e);
initialized = false;
@ -657,6 +664,9 @@ public class FailoverTransport implements CompositeTransport {
try {
transport.oneway(command);
stateTracker.trackBack(command);
if (command.isShutdownInfo()) {
shuttingDown = true;
}
} catch (IOException e) {
// If the command was not tracked.. we will retry in