[hornetq-commits] JBoss hornetq SVN: r9596 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-08-25 05:06:02 -0400 (Wed, 25 Aug 2010)
New Revision: 9596

Modified:
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/Topology.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
fixed topology size

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2010-08-25 08:39:01 UTC (rev 9595)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2010-08-25 09:06:02 UTC (rev 9596)
@@ -1131,7 +1131,7 @@
       {
          updateArraysAndPairs();
 
-         if (topology.size() == 1 && topology.getMember(this.nodeID) != null)
+         if (topology.nodes() == 1 && topology.getMember(this.nodeID) != null)
          {
             receivedTopology = false;
          }
@@ -1185,7 +1185,7 @@
    private void updateArraysAndPairs()
    {
       topologyArray = (Pair<TransportConfiguration, TransportConfiguration>[]) Array.newInstance(Pair.class,
-            topology.size());
+            topology.members());
 
       int count = 0;
       for (TopologyMember pair : topology.getMembers())

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/Topology.java	2010-08-25 08:39:01 UTC (rev 9595)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/Topology.java	2010-08-25 09:06:02 UTC (rev 9596)
@@ -116,7 +116,7 @@
       return topology.values();
    }
 
-   public int size()
+   public int nodes()
    {
       return nodes;
    }
@@ -137,4 +137,9 @@
       topology.clear();
       nodes = 0;
    }
+
+   public int members()
+   {
+      return topology.size();
+   }
 }

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-08-25 08:39:01 UTC (rev 9595)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-08-25 09:06:02 UTC (rev 9596)
@@ -254,7 +254,7 @@
          listener.nodeUP(nodeID, connectorPair, last, distance);
       }
 
-      if (distance < topology.size())
+      if (distance < topology.nodes())
       {
          for (ClusterTopologyListener listener : clusterConnectionListeners)
          {