diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java index 8bb6840f1c..f9598ee856 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java @@ -88,7 +88,7 @@ public class DiscoveryNetworkConnector extends NetworkConnector implements Disco } } - log.info("Establishing network connection between " + localURI + " and " + event.getBrokerName() + " at " + connectUri); + log.info("Establishing network connection between from " + localURI + " to " + connectUri); Transport localTransport; try { diff --git a/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java b/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java index 23d840d69a..049c984bf8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java @@ -16,9 +16,11 @@ */ package org.apache.activemq.network; -import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Set; -import org.apache.activemq.broker.BrokerService; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportFactory; @@ -27,10 +29,7 @@ import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; -import java.util.Set; +import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; /** * @version $Revision$ @@ -42,7 +41,7 @@ public abstract class NetworkConnector extends ServiceSupport { private String brokerName = "localhost"; private Set durableDestinations; - protected boolean failover = true; + protected boolean failover = false; private List excludedDestinations = new CopyOnWriteArrayList(); private List dynamicallyIncludedDestinations = new CopyOnWriteArrayList(); private List staticallyIncludedDestinations = new CopyOnWriteArrayList();