[hornetq-commits] JBoss hornetq SVN: r10760 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-06-01 13:33:20 -0400 (Wed, 01 Jun 2011)
New Revision: 10760

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
HORNETQ-705 - Reverting a change on blocking messages on the bridges

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-06-01 17:32:43 UTC (rev 10759)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-06-01 17:33:20 UTC (rev 10760)
@@ -362,8 +362,6 @@
          serverLocator.setBackup(server.getConfiguration().isBackup());
          serverLocator.setInitialConnectAttempts(-1);
          serverLocator.setConfirmationWindowSize(0);
-         serverLocator.setBlockOnDurableSend(false);
-         serverLocator.setBlockOnNonDurableSend(false);
 
          if(retryInterval > 0)
          {

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2011-06-01 17:32:43 UTC (rev 10759)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2011-06-01 17:33:20 UTC (rev 10760)
@@ -684,8 +684,6 @@
       serverLocator.setRetryIntervalMultiplier(config.getRetryIntervalMultiplier());
       serverLocator.setClientFailureCheckPeriod(config.getClientFailureCheckPeriod());
       serverLocator.setInitialConnectAttempts(config.getReconnectAttempts());
-      serverLocator.setBlockOnDurableSend(false);
-      serverLocator.setBlockOnNonDurableSend(false);
       clusterLocators.add(serverLocator);
       Bridge bridge = new BridgeImpl(serverLocator,
                                      nodeUUID,