[jboss-cvs] JBossAS SVN: r63924 - trunk/cluster/src/main/org/jboss/proxy/generic.

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

Author: bstansberry at jboss.com
Date: 2007-07-09 22:41:00 -0400 (Mon, 09 Jul 2007)
New Revision: 63924

Modified:
   trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
   trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHAMBean.java
Log:
[JBAS-4530] Direct inject HAPartition into ProxyFactoryHAMBean

Modified: trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2007-07-10 02:02:10 UTC (rev 63923)
+++ trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2007-07-10 02:41:00 UTC (rev 63924)
@@ -58,19 +58,19 @@
    protected HATarget target;
    protected Invoker invoker;
    protected DistributedReplicantManager drm = null;
-   protected ObjectName partitionObjectName;
+   protected HAPartition partition;
    protected String loadBalancePolicy = RoundRobin.class.getName();
    protected NotificationListener listener;
    protected int state = 0;
 
-   public ObjectName getPartitionObjectName()
+   public HAPartition getPartition()
    {
-      return partitionObjectName;
+      return partition;
    }
 
-   public void setPartitionObjectName(ObjectName partitionObjectName)
+   public void setPartition(HAPartition partition)
    {
-      this.partitionObjectName = partitionObjectName;
+      this.partition = partition;
    }
    
    public String getLoadBalancePolicy()
@@ -96,11 +96,8 @@
    
    protected void startService() throws Exception
    {
-      String partitionName = (String) getServer().getAttribute(partitionObjectName, "PartitionName");
-      HAPartition partition = (HAPartition) getServer().getAttribute(partitionObjectName, "HAPartition");
-      if (partition == null)
-         throw new RuntimeException("Partition is not registered: " + partitionObjectName);
-      this.drm = partition.getDistributedReplicantManager ();
+      String partitionName = partition.getPartitionName();
+      this.drm = partition.getDistributedReplicantManager();
       
       replicantName = getTargetName().toString();
       

Modified: trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHAMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHAMBean.java	2007-07-10 02:02:10 UTC (rev 63923)
+++ trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHAMBean.java	2007-07-10 02:41:00 UTC (rev 63924)
@@ -21,8 +21,7 @@
   */
 package org.jboss.proxy.generic;
 
-import javax.management.ObjectName;
-
+import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.invocation.jrmp.server.JRMPProxyFactoryMBean;
 
 /**
@@ -34,8 +33,8 @@
 public interface ProxyFactoryHAMBean
    extends JRMPProxyFactoryMBean
 {
-   ObjectName getPartitionObjectName();
-   void setPartitionObjectName(ObjectName partitionObjectName);
+   HAPartition getPartition();
+   void setPartition(HAPartition partition);
    String getLoadBalancePolicy();
    void setLoadBalancePolicy(String loadBalancePolicy);
 }