[jboss-cvs] JBossAS SVN: r76148 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster.

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

Author: bstansberry at jboss.com
Date: 2008-07-23 17:35:12 -0400 (Wed, 23 Jul 2008)
New Revision: 76148

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
Log:
[JBAS-5798] Add a placeholder mbean interface
[JBAS-5659] Fix broken construction of RpcHandler

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-07-23 21:34:23 UTC (rev 76147)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-07-23 21:35:12 UTC (rev 76148)
@@ -73,7 +73,7 @@
  * @version $Revision$
  */
 public class ModClusterService extends HASingletonSupport 
-   implements JBossWebEventHandler
+   implements JBossWebEventHandler, ModClusterServiceMBean
 {
    // -----------------------------------------------------------------  Fields
    
@@ -86,7 +86,7 @@
    private final MCMPHandler localHandler;
    private final ClusteredMCMPHandler clusteredHandler;
    private final LoadBalanceFactorProvider loadManager;
-   private final RpcHandler rpcHandler = new RpcHandler();
+   private final RpcHandler rpcHandler;
    private final JBossWebEventHandler eventHandlerDelegate;
    private final ModClusterServiceHASingletonElectionPolicy electionPolicy;
    private final String domain;
@@ -106,6 +106,21 @@
     * @param partition   the partition of which we are a member
     * @param config      our configuration
     * @param loadFactorProvider source for local load balance statistics
+    */
+   public ModClusterService(HAPartition partition,
+                             ModClusterConfig config,
+                             LoadBalanceFactorProvider loadFactorProvider)
+   {
+      this(partition, config, loadFactorProvider, null);
+   }
+   
+   
+   /**
+    * Create a new ClusterCoordinator.
+    * 
+    * @param partition   the partition of which we are a member
+    * @param config      our configuration
+    * @param loadFactorProvider source for local load balance statistics
     * @param singletonElector chooses the singleton master
     */
    public ModClusterService(HAPartition partition,
@@ -131,6 +146,8 @@
       setElectionPolicy(this.electionPolicy);
       
       this.drmEntry = new ModClusterServiceDRMEntry(partition.getClusterNode(), null);
+      
+      this.rpcHandler = new RpcHandler();
    }
    
    /**
@@ -179,6 +196,8 @@
       setElectionPolicy(this.electionPolicy);
       
       this.drmEntry = new ModClusterServiceDRMEntry(partition.getClusterNode(), null);
+      
+      this.rpcHandler = new RpcHandler();
    }
    
    // ---------------------------------------------------- JBossWebEventHandler