[Jboss-cvs] JBossAS SVN: r56377 - branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/framework/server

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

Author: ryan.campbell at jboss.com
Date: 2006-08-28 21:49:02 -0400 (Mon, 28 Aug 2006)
New Revision: 56377

Modified:
   branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
merged JBAS-2453: JBAS-2439 Patch for 4.0.3SP1 and 4.0.3: A ClassCastException is no longer thrown by the DistributedReplicantManager service when a cluster merge occurs.

Modified: branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2006-08-29 00:48:36 UTC (rev 56376)
+++ branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2006-08-29 01:49:02 UTC (rev 56377)
@@ -788,7 +788,7 @@
                continue;
             }
             String node = (String)objs[0];
-            HashMap replicants = (HashMap)objs[1];
+            Map replicants = (Map)objs[1];
             Iterator keys = replicants.keySet().iterator();
             
             //FIXME: We don't remove keys in the merge process but only add new keys!