User: patriot1burke Date: 02/03/10 22:26:22 Modified: src/main/org/jboss/proxy/ejb ProxyFactoryHA.java Log: fixes after client-interceptor break Revision Changes Path 1.6 +17 -24 jbossmx/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java Index: ProxyFactoryHA.java =================================================================== RCS file: /cvsroot/jboss/jbossmx/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ProxyFactoryHA.java 27 Feb 2002 11:07:41 -0000 1.5 +++ ProxyFactoryHA.java 11 Mar 2002 06:26:21 -0000 1.6 @@ -28,7 +28,7 @@ * ProxyFactory for Clustering * * @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a> -* @version $Revision: 1.5 $ +* @version $Revision: 1.6 $ * * <p><b>Revisions:</b><br> * <p><b>2002/01/13: billb</b> @@ -43,16 +43,10 @@ protected HATarget homeTarget; protected HATarget beanTarget; - protected void initInvokers() throws Exception + protected void setupInvokers() throws Exception { - if (container == null) System.out.println("container is null"); - if (container.getBeanMetaData() == null) System.out.println("is null"); - if (container.getBeanMetaData().getClusterConfigMetaData() == null) System.out.println("is null"); - if (container.getBeanMetaData().getClusterConfigMetaData().getPartitionName() == null) System.out.println("is null"); - String partitionName = container.getBeanMetaData().getClusterConfigMetaData().getPartitionName(); HAPartition partition = (HAPartition)new InitialContext().lookup("/HAPartition/" + partitionName); - String beanName = "jboss.j2ee:service=EJB,jndiName="+container.getBeanMetaData().getJndiName(); ObjectName oname; @@ -70,16 +64,16 @@ // If invokers are the same don't register twice. if (homejrmp == beanjrmp) { - homeTarget = new HATarget(partition, beanName, homejrmp.getStub ()); + homeTarget = new HATarget(partition, jmxName, homejrmp.getStub ()); beanTarget = homeTarget; - homejrmp.registerBean(beanName, homeTarget); + homejrmp.registerBean(jmxName, homeTarget); } else { - homeTarget = new HATarget(partition, beanName + "/home", homejrmp.getStub ()); - homejrmp.registerBean(beanName, homeTarget); - beanTarget = new HATarget(partition, beanName + "/bean", beanjrmp.getStub ()); - beanjrmp.registerBean(beanName, beanTarget); + homeTarget = new HATarget(partition, jmxName + "/home", homejrmp.getStub ()); + homejrmp.registerBean(jmxName, homeTarget); + beanTarget = new HATarget(partition, jmxName + "/bean", beanjrmp.getStub ()); + beanjrmp.registerBean(jmxName, beanTarget); } @@ -89,32 +83,31 @@ clazz = cl.loadClass(container.getBeanMetaData().getClusterConfigMetaData().getHomeLoadBalancePolicy()); policy = (LoadBalancePolicy)clazz.newInstance(); - homeInvoker = homejrmp.createProxy(beanName, policy); + homeInvoker = homejrmp.createProxy(jmxName, policy); clazz = cl.loadClass(container.getBeanMetaData().getClusterConfigMetaData().getBeanLoadBalancePolicy()); policy = (LoadBalancePolicy)clazz.newInstance(); - beanInvoker = beanjrmp.createProxy(beanName, policy); + beanInvoker = beanjrmp.createProxy(jmxName, policy); - JRMPInvokerProxyHA.colocation.add(beanName); + JRMPInvokerProxyHA.colocation.add(new Integer(objectName)); } - public void stop() + public void destroy() { - super.stop(); + super.destroy(); try { - String beanName = "jboss.j2ee:service=EJB,jndiName="+container.getBeanMetaData().getJndiName(); // If invokers are the same don't register twice. - JRMPInvokerProxyHA.colocation.remove(beanName); + JRMPInvokerProxyHA.colocation.remove(new Integer(objectName)); if (homejrmp == beanjrmp) { - homejrmp.unregisterBean(beanName); + homejrmp.unregisterBean(jmxName); homeTarget.destroy(); } else { - homejrmp.unregisterBean(beanName); - beanjrmp.unregisterBean(beanName); + homejrmp.unregisterBean(jmxName); + beanjrmp.unregisterBean(jmxName); homeTarget.destroy(); beanTarget.destroy(); }
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
