[jboss-cvs] JBossAS SVN: r111887 - branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/framework/server.

[jboss-cvs-commits at lists.jboss.org]

Author: dereed
Date: 2011-07-29 17:03:31 -0400 (Fri, 29 Jul 2011)
New Revision: 111887

Modified:
   branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
[JBPAPP-6932] Fix HASingleton behavior on merge


Modified: branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2011-07-29 16:37:00 UTC (rev 111886)
+++ branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2011-07-29 21:03:31 UTC (rev 111887)
@@ -837,7 +837,7 @@
       
       ConcurrentMap<String, Serializable> existingMap = this.replicants.putIfAbsent(key, map);
       
-      return (((existingMap != null) ? existingMap : map).put(nodeName, replicant) != null);
+      return (((existingMap != null) ? existingMap : map).put(nodeName, replicant) == null);
    }
    
    /**