[hornetq-commits] JBoss hornetq SVN: r11542 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2011-10-14 12:59:20 -0400 (Fri, 14 Oct 2011)
New Revision: 11542

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
removed unwanted locators0 variable

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-10-14 16:54:56 UTC (rev 11541)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-10-14 16:59:20 UTC (rev 11542)
@@ -121,8 +121,6 @@
 
    protected NodeManager[] nodeManagers;
 
-   protected ServerLocator[] locators0;
-
    protected ClientSessionFactory[] sfs;
 
    protected long[] timeStarts;
@@ -184,7 +182,6 @@
       }
       UnitTestCase.checkFreePort(ClusterTestBase.PORTS);
 
-      locators0 = null;
       servers = null;
 
       sfs = null;
@@ -592,15 +589,15 @@
 
    protected void closeAllServerLocatorsFactories() throws Exception
    {
-      for (int i = 0; i < locators0.length; i++)
+      for (int i = 0; i < locators.length; i++)
       {
-         ServerLocator sf = locators0[i];
+         ServerLocator sf = locators[i];
 
          if (sf != null)
          {
             sf.close();
 
-            locators0[i] = null;
+            locators[i] = null;
          }
       }
    }
@@ -1400,16 +1397,16 @@
 
       if (ha)
       {
-         locators0[node] = HornetQClient.createServerLocatorWithHA(serverTotc);
+         locators[node] = HornetQClient.createServerLocatorWithHA(serverTotc);
       }
       else
       {
-         locators0[node] = HornetQClient.createServerLocatorWithoutHA(serverTotc);
+         locators[node] = HornetQClient.createServerLocatorWithoutHA(serverTotc);
       }
 
-      locators0[node].setBlockOnNonDurableSend(true);
-      locators0[node].setBlockOnDurableSend(true);
-      ClientSessionFactory sf = locators0[node].createSessionFactory();
+      locators[node].setBlockOnNonDurableSend(true);
+      locators[node].setBlockOnDurableSend(true);
+      ClientSessionFactory sf = locators[node].createSessionFactory();
 
       ClientSession session = sf.createSession();
       session.close();
@@ -1436,12 +1433,12 @@
          serverTotc = new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY, params);
       }
 
-      locators0[node] = HornetQClient.createServerLocatorWithoutHA(serverTotc);
+      locators[node] = HornetQClient.createServerLocatorWithoutHA(serverTotc);
 
-      locators0[node].setBlockOnNonDurableSend(true);
-      locators0[node].setBlockOnDurableSend(true);
-      locators0[node].setReconnectAttempts(reconnectAttempts);
-      ClientSessionFactory sf = locators0[node].createSessionFactory();
+      locators[node].setBlockOnNonDurableSend(true);
+      locators[node].setBlockOnDurableSend(true);
+      locators[node].setReconnectAttempts(reconnectAttempts);
+      ClientSessionFactory sf = locators[node].createSessionFactory();
 
       sfs[node] = sf;
    }
@@ -1466,14 +1463,14 @@
          serverTotc = new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY, params);
       }
 
-      locators0[node] = HornetQClient.createServerLocatorWithHA(serverTotc);
-      locators0[node].setRetryInterval(100);
-      locators0[node].setRetryIntervalMultiplier(1d);
-      locators0[node].setReconnectAttempts(-1);
-      locators0[node].setBlockOnNonDurableSend(blocking);
-      locators0[node].setBlockOnDurableSend(blocking);
+      locators[node] = HornetQClient.createServerLocatorWithHA(serverTotc);
+      locators[node].setRetryInterval(100);
+      locators[node].setRetryIntervalMultiplier(1d);
+      locators[node].setReconnectAttempts(-1);
+      locators[node].setBlockOnNonDurableSend(blocking);
+      locators[node].setBlockOnDurableSend(blocking);
 
-      ClientSessionFactory sf = locators0[node].createSessionFactory();
+      ClientSessionFactory sf = locators[node].createSessionFactory();
       sfs[node] = sf;
    }