Repository: activemq Updated Branches: refs/heads/trunk 35115fece -> f38cb588d
fix hang on org.apache.activemq.network.FailoverStaticNetworkTest - network connector vm creation clashing with broker stop Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/981c0f20 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/981c0f20 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/981c0f20 Branch: refs/heads/trunk Commit: 981c0f20fa96b9d30c362cae779cfbe60a5f5e5b Parents: 35115fe Author: gtully <[email protected]> Authored: Fri Jan 23 11:27:10 2015 +0000 Committer: gtully <[email protected]> Committed: Fri Jan 23 11:27:10 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/network/NetworkBridgeFactory.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/981c0f20/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java index 585e905..41a9d9e 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java +++ b/activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java @@ -76,6 +76,7 @@ public final class NetworkBridgeFactory { HashMap<String, String> map = new HashMap<String, String>(URISupport.parseParameters(uri)); map.put("network", "true"); map.put("async", "true"); + map.put("create", "false"); // we don't want a vm connect during shutdown to trigger a broker create uri = URISupport.createURIWithQuery(uri, URISupport.createQueryString(map)); return TransportFactory.connect(uri); }
