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

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-07-26 21:26:35 -0400 (Tue, 26 Jul 2011)
New Revision: 11047

Modified:
   branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
Log:
fix

Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-07-26 22:58:42 UTC (rev 11046)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-07-27 01:26:35 UTC (rev 11047)
@@ -412,6 +412,7 @@
       if (serverLocator != null)
       {
          serverLocator.setNodeID(nodeUUID.toString());
+         serverLocator.setIdentity(server.toString());
 
          serverLocator.setReconnectAttempts(0);
 
@@ -502,8 +503,7 @@
    }
 
 
-   // TODO: does it need to be sync?
-   public void nodeUP(final String nodeID,
+   public synchronized void nodeUP(final String nodeID,
                                    final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
                                    final boolean last)
    {
@@ -645,6 +645,7 @@
       targetLocator.setBlockOnDurableSend(!useDuplicateDetection);
       targetLocator.setBlockOnNonDurableSend(!useDuplicateDetection);
       targetLocator.setClusterConnection(true);
+      targetLocator.setIdentity("Cluster-connection-bridge on ClusterConnectionImpl=" + this.toString());
       
       targetLocator.setRetryInterval(retryInterval);
       targetLocator.setMaxRetryInterval(maxRetryInterval);