[jboss-cvs] JBossAS SVN: r111888 - branches/JBPAPP_5_1/cluster/src/main/org/jboss/profileservice/cluster/repository.

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

Author: dereed
Date: 2011-07-29 17:37:43 -0400 (Fri, 29 Jul 2011)
New Revision: 111888

Modified:
   branches/JBPAPP_5_1/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java
Log:
[JBPAPP-6933] Fix possible race condition in farm service when merging before service is fully started.


Modified: branches/JBPAPP_5_1/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java
===================================================================
--- branches/JBPAPP_5_1/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java	2011-07-29 21:03:31 UTC (rev 111887)
+++ branches/JBPAPP_5_1/cluster/src/main/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java	2011-07-29 21:37:43 UTC (rev 111888)
@@ -1163,7 +1163,7 @@
          if (merge)
          {
             ClusterNode master = (ClusterNode) (newReplicants.size() > 0 ? newReplicants.get(0) : null);
-            inSync = (master != null && oldView.contains(master));
+            inSync = inSync && (master != null && oldView.contains(master));
          }
       }      
    }