[jboss-cvs] JBossAS SVN: r85989 - projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server.

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

Author: pferraro
Date: 2009-03-17 10:27:19 -0400 (Tue, 17 Mar 2009)
New Revision: 85989

Modified:
   projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
Log:
Fix bug in JBAS-2647 fix due to refactoring of RecordingReplicantListener from an anonymous class.

Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2009-03-17 14:26:28 UTC (rev 85988)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2009-03-17 14:27:19 UTC (rev 85989)
@@ -98,11 +98,11 @@
    {
       DistributedReplicantManager drm = this.getHAPartition().getDistributedReplicantManager();
       
-      final String key = this.getHAServiceKey();
-      
       // Temporary drm listener
       RecordingReplicantListener listener = new RecordingReplicantListener();
       
+      String key = this.getHAServiceKey();
+      
       // record replicant changes, but don't handle them just yet
       drm.registerListener(key, listener);
 
@@ -366,7 +366,7 @@
       @SuppressWarnings("unchecked")
       public void replicantsChanged(String key, List newReplicants, int newReplicantsViewId, boolean merge)
       {
-         if (key.equals(key))
+         if (HASingletonImpl.this.getHAServiceKey().equals(key))
          {
             // Record replicant change - overwriting any previously recorded view
             HASingletonImpl.this.viewReference.set(new ReplicantView(newReplicants, newReplicantsViewId, merge));