svn commit: r386670 - in /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network: DiscoveryNetworkConnector.java NetworkConnector.java

[ch...@apache.org]

Author: chirino
Date: Fri Mar 17 08:43:21 2006
New Revision: 386670

URL: http://svn.apache.org/viewcvs?rev=386670&view=rev
Log:
The default should be failover=false.  We can't assume that normal configurations will use broker nodes that never fail.

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?rev=386670&r1=386669&r2=386670&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java Fri Mar 17 08:43:21 2006
@@ -88,7 +88,7 @@
                 }
             }
 
-            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 {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java?rev=386670&r1=386669&r2=386670&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java Fri Mar 17 08:43:21 2006
@@ -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.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 @@
     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();