[jboss-cvs] JBoss Messaging SVN: r6811 - in trunk/src/main/org/jboss/messaging/core: config/impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2009-05-15 12:35:26 -0400 (Fri, 15 May 2009)
New Revision: 6811

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
   trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
   trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
Log:
some tweaks to default values

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2009-05-15 16:34:29 UTC (rev 6810)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2009-05-15 16:35:26 UTC (rev 6811)
@@ -91,7 +91,7 @@
 
    public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false;
 
-   public static final long DEFAULT_DISCOVERY_INITIAL_WAIT = 10000;
+   public static final long DEFAULT_DISCOVERY_INITIAL_WAIT = 2000;
 
    public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000;
 

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-05-15 16:34:29 UTC (rev 6810)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-05-15 16:35:26 UTC (rev 6811)
@@ -119,7 +119,7 @@
 
    public static final long DEFAULT_MANAGEMENT_REQUEST_TIMEOUT = 5000;
 
-   public static final long DEFAULT_BROADCAST_PERIOD = 5000;
+   public static final long DEFAULT_BROADCAST_PERIOD = 1000;
 
    public static final long DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000;
 
@@ -136,6 +136,8 @@
    public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false;
 
    public static final int DEFAULT_CLUSTER_MAX_HOPS = 1;
+   
+   public static final int DEFAULT_CLUSTER_RETRY_INTERVAL = 500;
 
    public static final boolean DEFAULT_DIVERT_EXCLUSIVE = false;
 

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-05-15 16:34:29 UTC (rev 6810)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-05-15 16:35:26 UTC (rev 6811)
@@ -25,6 +25,8 @@
 import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
 import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
 import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL;
+
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
 import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
@@ -564,7 +566,7 @@
 
       int maxHops = DEFAULT_CLUSTER_MAX_HOPS;
 
-      long retryInterval = DEFAULT_RETRY_INTERVAL;
+      long retryInterval = DEFAULT_CLUSTER_RETRY_INTERVAL;
 
       List<Pair<String, String>> connectorPairs = new ArrayList<Pair<String, String>>();