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

Better failover error handling and now we pass on the max initial inactivity timeout to the timeout used by the intial wire format negociation. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@640641 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2008-03-24 23:19:50 +00:00
parent 0a4c8064e4
commit c04d8c548d
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
View File

@ -57,6 +57,13 @@ public class WireFormatNegotiator extends TransportFilter {
minimumVersion = 1;
}
this.minimumVersion = minimumVersion;
// Setup the initial negociation timeout to be the same as the inital max inactivity delay specified on the wireformat
// Does not make sense for us to take longer.
try {
setNegotiateTimeout(wireFormat.getPreferedWireFormatInfo().getMaxInactivityDurationInitalDelay());
} catch (IOException e) {
}
}
public void start() throws Exception {

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

@ -94,7 +94,7 @@ public class FailoverTransport implements CompositeTransport {
private int backupPoolSize=1;
private boolean trackMessages = false;
private int maxCacheSize = 128 * 1024;
private TransportListener disposedListener = new DefaultTransportListener();
private TransportListener disposedListener = new DefaultTransportListener() {};
private final TransportListener myTransportListener = createTransportListener();
@ -189,42 +189,33 @@ public class FailoverTransport implements CompositeTransport {
public final void handleTransportFailure(IOException e) throws InterruptedException {
Transport transport = connectedTransport.get();
Transport transport = connectedTransport.getAndSet(null);
if( transport!=null ) {
ServiceSupport.dispose(transport);
}
boolean wasConnected=false;
synchronized (reconnectMutex) {
boolean reconnectOk = false;
if(started) {
LOG.warn("Transport failed, attempting to automatically reconnect due to: " + e);
LOG.debug("Transport failed with the following exception:", e);
reconnectOk = true;
}
if (connectedTransport.get() != null) {
wasConnected=true;
transport.setTransportListener(disposedListener);
ServiceSupport.dispose(transport);
synchronized (reconnectMutex) {
boolean reconnectOk = false;
if(started) {
LOG.warn("Transport failed, attempting to automatically reconnect due to: " + e);
LOG.debug("Transport failed with the following exception:", e);
reconnectOk = true;
}
initialized = false;
failedConnectTransportURI=connectedTransportURI;
Transport old = connectedTransport.get();
if(old != null) {
//don't want errors from old transport
old.setTransportListener(disposedListener);
}
connectedTransport.set(null);
connectedTransportURI = null;
connected=false;
if(reconnectOk) {
reconnectTask.wakeup();
}
}
if(reconnectOk) {
reconnectTask.wakeup();
}
}
// Avoid double firing a transportInterupted() event due to an extra IOException
if (transportListener != null && wasConnected) {
transportListener.transportInterupted();
if (transportListener != null) {
transportListener.transportInterupted();
}
}
}