[hornetq-commits] JBoss hornetq SVN: r11378 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-09-20 12:40:18 -0400 (Tue, 20 Sep 2011)
New Revision: 11378

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
quick fix

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2011-09-20 15:46:55 UTC (rev 11377)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2011-09-20 16:40:18 UTC (rev 11378)
@@ -165,7 +165,7 @@
    private Executor startExecutor;
 
    private static ScheduledExecutorService globalScheduledThreadPool;
-   
+
    private AfterConnectInternalListener afterConnectListener;
 
    private String groupID;
@@ -549,7 +549,7 @@
          }
       });
    }
-   
+
    public Executor getExecutor()
    {
       return startExecutor;
@@ -592,7 +592,7 @@
    {
       return afterConnectListener;
    }
-   
+
    public boolean isClosed()
    {
       return closed || closing;
@@ -1115,7 +1115,7 @@
    {
       return identity;
    }
-   
+
    public void setIdentity(String identity)
    {
       this.identity = identity;
@@ -1287,15 +1287,17 @@
       {
          log.debug("nodeDown " + this + " nodeID=" + nodeID + " as being down", new Exception("trace"));
       }
-      
+
       if (topology.removeMember(eventTime, nodeID))
       {
          if (topology.isEmpty())
          {
             // Resetting the topology to its original condition as it was brand new
-            topologyArray = null;
-
-            receivedTopology = false;
+            synchronized (this)
+            {
+               topologyArray = null;
+               receivedTopology = false;
+            }
          }
          else
          {
@@ -1406,7 +1408,7 @@
       for (DiscoveryEntry entry : newConnectors)
       {
          this.initialConnectors[count++] = entry.getConnector();
-         
+
          if (topology != null && topology.getMember(entry.getNodeID()) == null)
          {
             TopologyMember member = new TopologyMember(entry.getConnector(), null);