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-6322 - Introduce timeout in network bridge for waiting broker infos

This commit is contained in:
Dejan Bosanac 2016-06-14 14:29:11 +02:00
parent dbed28e625
commit 9f9b0fb26a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -90,6 +90,7 @@ import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportDisposedIOException; import org.apache.activemq.transport.TransportDisposedIOException;
import org.apache.activemq.transport.TransportFilter; import org.apache.activemq.transport.TransportFilter;
import org.apache.activemq.transport.tcp.SslTransport; import org.apache.activemq.transport.tcp.SslTransport;
import org.apache.activemq.transport.tcp.TcpTransport;
import org.apache.activemq.util.IdGenerator; import org.apache.activemq.util.IdGenerator;
import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.LongSequenceGenerator;
@ -342,11 +343,16 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
} }
private void collectBrokerInfos() { private void collectBrokerInfos() {
int timeout = 30000;
TcpTransport tcpTransport = remoteBroker.narrow(TcpTransport.class);
if (tcpTransport != null) {
timeout = tcpTransport.getConnectionTimeout();
}
// First wait for the remote to feed us its BrokerInfo, then we can check on // First wait for the remote to feed us its BrokerInfo, then we can check on
// the LocalBrokerInfo and decide is this is a loop. // the LocalBrokerInfo and decide is this is a loop.
try { try {
remoteBrokerInfo = futureRemoteBrokerInfo.get(); remoteBrokerInfo = futureRemoteBrokerInfo.get(timeout, TimeUnit.MILLISECONDS);
if (remoteBrokerInfo == null) { if (remoteBrokerInfo == null) {
serviceLocalException(new Throwable("remoteBrokerInfo is null")); serviceLocalException(new Throwable("remoteBrokerInfo is null"));
return; return;
@ -357,7 +363,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
} }
try { try {
localBrokerInfo = futureLocalBrokerInfo.get(); localBrokerInfo = futureLocalBrokerInfo.get(timeout, TimeUnit.MILLISECONDS);
if (localBrokerInfo == null) { if (localBrokerInfo == null) {
serviceLocalException(new Throwable("localBrokerInfo is null")); serviceLocalException(new Throwable("localBrokerInfo is null"));
return; return;