mirror of https://github.com/apache/activemq.git
merge -c 833435 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent failure of DiscoveryNetworkReconnectTest due to network timing issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9ba1eb1527
commit
2c414b7417
|
@ -45,7 +45,7 @@ import org.apache.commons.logging.Log;
|
|||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* A Flow provides different dispatch policies within the NMR
|
||||
* An abstraction over JMX mbean registration
|
||||
*
|
||||
* @org.apache.xbean.XBean
|
||||
* @version $Revision$
|
||||
|
@ -96,6 +96,7 @@ public class ManagementContext implements Service {
|
|||
try {
|
||||
JMXConnectorServer server = connectorServer;
|
||||
if (started.get() && server != null) {
|
||||
LOG.debug("Starting JMXConnectorServer...");
|
||||
connectorStarting.set(true);
|
||||
try {
|
||||
server.start();
|
||||
|
|
|
@ -202,8 +202,11 @@ public class DiscoveryNetworkReconnectTest {
|
|||
// wait for the inactivity timeout and network shutdown
|
||||
assertTrue("network connector mbean unregistered within 3 minute", mbeanUnregistered.tryAcquire(180, TimeUnit.SECONDS));
|
||||
|
||||
// whack all connections
|
||||
proxy.close();
|
||||
|
||||
// let a reconnect succeed
|
||||
proxy.goOn();
|
||||
proxy.reopen();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue