[jboss-cvs] JBossAS SVN: r82164 - branches/Branch_4_2/cluster/src/main/org/jboss/proxy/generic.

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

Author: bstansberry at jboss.com
Date: 2008-12-09 20:14:34 -0500 (Tue, 09 Dec 2008)
New Revision: 82164

Modified:
   branches/Branch_4_2/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
Log:
[JBAS-6284] Use ProxyFactoryHA to proxy requests to target service.

Modified: branches/Branch_4_2/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
===================================================================
--- branches/Branch_4_2/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2008-12-10 01:12:51 UTC (rev 82163)
+++ branches/Branch_4_2/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2008-12-10 01:14:34 UTC (rev 82164)
@@ -112,7 +112,7 @@
       if (state == ServiceMBean.STARTED)
          mode = HATarget.ENABLE_INVOCATIONS;
       target = new HATarget(partition, replicantName, invokerHA.getStub(), mode);
-      invokerHA.registerBean(getTargetName(), target);
+      invokerHA.registerBean(getServiceName(), target);
 
       String clusterFamilyName = partitionName + "/" + getTargetName() + "/";
       
@@ -127,7 +127,7 @@
       
       clazz = cl.loadClass(loadBalancePolicy);
       policy = (LoadBalancePolicy)clazz.newInstance();
-      invoker = invokerHA.createProxy(getTargetName(), policy, clusterFamilyName + "H");
+      invoker = invokerHA.createProxy(getServiceName(), policy, clusterFamilyName + "H");
       
       // JRMPInvokerProxyHA.colocation.add(new Integer(jmxNameHash));
 
@@ -141,7 +141,7 @@
       try
       {
          // JRMPInvokerProxyHA.colocation.remove(new Integer(jmxNameHash));
-         invokerHA.unregisterBean(getTargetName());
+         invokerHA.unregisterBean(getServiceName());
          target.destroy();
       } 
       catch (Exception ignored)
@@ -202,7 +202,7 @@
    )
    {
       GenericProxyFactory proxyFactory = new GenericProxyFactory();
-      theProxy = proxyFactory.createProxy(cacheID, getTargetName(), invoker,
+      theProxy = proxyFactory.createProxy(cacheID, getServiceName(), invoker,
          getJndiName(), proxyBindingName, getInterceptorClasses(), loader, ifaces);
    }