[jboss-cvs] JBossAS SVN: r111937 - in branches/JBPAPP_5_0_0_GA_JBPAPP-6969: cluster/src/main/org/jboss/ha/framework/server and 1 other directory.

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

Author: klape
Date: 2011-08-04 18:05:01 -0400 (Thu, 04 Aug 2011)
New Revision: 111937

Modified:
   branches/JBPAPP_5_0_0_GA_JBPAPP-6969/
   branches/JBPAPP_5_0_0_GA_JBPAPP-6969/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
[JBPAPP-6969] Fix bug where HASingleton doesn't stop after merge when host is no longer master


Property changes on: branches/JBPAPP_5_0_0_GA_JBPAPP-6969
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/JBPAPP_5_1:111887

Modified: branches/JBPAPP_5_0_0_GA_JBPAPP-6969/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- branches/JBPAPP_5_0_0_GA_JBPAPP-6969/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2011-08-04 20:40:37 UTC (rev 111936)
+++ branches/JBPAPP_5_0_0_GA_JBPAPP-6969/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2011-08-04 22:05:01 UTC (rev 111937)
@@ -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);
    }
    
    /**