[jboss-cvs] JBossAS SVN: r111856 - branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jmx.

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

Author: tibrahim
Date: 2011-07-27 00:11:55 -0400 (Wed, 27 Jul 2011)
New Revision: 111856

Modified:
   branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
Log:
Applied patch for https://issues.jboss.org/browse/JBPAPP-6797. This fixes the errors during deployment of HASingletonController as a MBean before ClusterPartition is fully started.

Modified: branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
===================================================================
--- branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java	2011-07-26 22:48:38 UTC (rev 111855)
+++ branches/JBPAPP_5_1/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java	2011-07-27 04:11:55 UTC (rev 111856)
@@ -50,6 +50,7 @@
    implements HAServiceMBean, HAService<Notification>, EventFactory<Notification>, EventFacility<Notification>
 {
    private final S service = this.createHAService();
+   private ClusterPartitionMBean clusterPartition;
 
    private volatile boolean sendLocalLifecycleNotifications = true;
    private volatile boolean sendRemoteLifecycleNotifications = true;
@@ -84,7 +85,7 @@
    {
       if ((this.getState() != STARTED) && (this.getState() != STARTING))
       {
-         this.service.setHAPartition(clusterPartition.getHAPartition());
+         this.clusterPartition = clusterPartition;
       }
    }
 
@@ -224,7 +225,8 @@
 
    protected void setupPartition() throws Exception
    {
-      // method no longer used by base implementation
+      if ( clusterPartition != null )
+         this.service.setHAPartition(clusterPartition.getHAPartition());
    }
 
    @SuppressWarnings("unchecked")