User: mnf999  
  Date: 02/02/06 13:16:00

  Modified:    src/main/org/jboss/proxy/ejb ProxyFactoryHA.java
  Log:
  Bill, stop bitching already.  Here is the rest of it :)
  
  Revision  Changes    Path
  1.3       +55 -55    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProxyFactoryHA.java       2002/01/14 20:29:18     1.2
  +++ ProxyFactoryHA.java       2002/02/06 21:15:59     1.3
  @@ -1,9 +1,9 @@
   /*
  - * JBoss, the OpenSource J2EE webOS
  - *
  - * Distributable under LGPL license.
  - * See terms of license at gnu.org.
  - */
  +* JBoss, the OpenSource J2EE webOS
  +*
  +* Distributable under LGPL license.
  +* See terms of license at gnu.org.
  +*/
   package org.jboss.proxy.ejb;
   
   import javax.management.ObjectName;
  @@ -26,104 +26,104 @@
   
   import java.util.HashMap;
   /**
  - * ProxyFactory for Clustering
  - *
  - *  @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  - *  @version $Revision: 1.2 $
  - *
  - *  <p><b>Revisions:</b><br>
  - *  <p><b>2002/01/13: billb</b>
  - *  <ol>
  - *   <li>Initial Revisition
  - *  </ol>
  - */
  +* ProxyFactory for Clustering
  +*
  +*  @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  +*  @version $Revision: 1.3 $
  +*
  +*  <p><b>Revisions:</b><br>
  +*  <p><b>2002/01/13: billb</b>
  +*  <ol>
  +*   <li>Initial Revisition
  +*  </ol>
  +*/
   public class ProxyFactoryHA extends ProxyFactory
   {
      protected JRMPInvokerHA homejrmp;
      protected JRMPInvokerHA beanjrmp;
      protected HATarget homeTarget;
      protected HATarget beanTarget;
  -
  +   
      protected void initInvokers() 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");
  -
  +         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;
         
         // Get the local invoker
         oname = new ObjectName(container.getBeanMetaData().getHomeInvoker());
         homejrmp = (JRMPInvokerHA)Registry.lookup(oname);
         if (homejrmp == null)
  -      throw new RuntimeException("home JRMPInvokerHA is null: " + oname);
  -
  +         throw new RuntimeException("home JRMPInvokerHA is null: " + oname);
  +      
         oname = new ObjectName(container.getBeanMetaData().getBeanInvoker());
         beanjrmp = (JRMPInvokerHA)Registry.lookup(oname);
         if (beanjrmp == null)
  -      throw new RuntimeException("bean JRMPInvokerHA is null: " + oname);
  -
  +         throw new RuntimeException("bean JRMPInvokerHA is null: " + oname);
  +      
         // If invokers are the same don't register twice.
         if (homejrmp == beanjrmp)
         {
  -      homeTarget = new HATarget(partition, beanName, homejrmp.getStub ());
  -      beanTarget = homeTarget;
  -      homejrmp.registerBean(beanName, homeTarget);
  +         homeTarget = new HATarget(partition, beanName, homejrmp.getStub ());
  +         beanTarget = homeTarget;
  +         homejrmp.registerBean(beanName, 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, beanName + "/home", homejrmp.getStub 
());
  +         homejrmp.registerBean(beanName, homeTarget);
  +         beanTarget = new HATarget(partition, beanName + "/bean", beanjrmp.getStub 
());
  +         beanjrmp.registerBean(beanName, beanTarget);
         }
  -
  -
  +      
  +      
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         Class clazz;
         LoadBalancePolicy policy;
  -
  +      
         clazz = 
cl.loadClass(container.getBeanMetaData().getClusterConfigMetaData().getHomeLoadBalancePolicy());
         policy = (LoadBalancePolicy)clazz.newInstance();
         homeInvoker = homejrmp.createProxy(beanName, policy);
  -
  +      
         clazz = 
cl.loadClass(container.getBeanMetaData().getClusterConfigMetaData().getBeanLoadBalancePolicy());
         policy = (LoadBalancePolicy)clazz.newInstance();
         beanInvoker = homejrmp.createProxy(beanName, policy);
  -
  +      
         JRMPInvokerProxyHA.colocation.add(beanName);
      }
  -         
  +   
      public void stop()
      {
         super.stop();
         try
         {
  -      String beanName = 
"jboss.j2ee:service=EJB,jndiName="+container.getBeanMetaData().getJndiName();
  -      // If invokers are the same don't register twice.
  -      JRMPInvokerProxyHA.colocation.remove(beanName);
  -      if (homejrmp == beanjrmp)
  -      {
  -         homejrmp.unregisterBean(beanName);
  -         homeTarget.destroy();
  -      }
  -      else
  -      {
  -         homejrmp.unregisterBean(beanName);
  -         beanjrmp.unregisterBean(beanName);
  -         homeTarget.destroy();
  -         beanTarget.destroy();
  -      }
  +         String beanName = 
"jboss.j2ee:service=EJB,jndiName="+container.getBeanMetaData().getJndiName();
  +         // If invokers are the same don't register twice.
  +         JRMPInvokerProxyHA.colocation.remove(beanName);
  +         if (homejrmp == beanjrmp)
  +         {
  +            homejrmp.unregisterBean(beanName);
  +            homeTarget.destroy();
  +         }
  +         else
  +         {
  +            homejrmp.unregisterBean(beanName);
  +            beanjrmp.unregisterBean(beanName);
  +            homeTarget.destroy();
  +            beanTarget.destroy();
  +         }
         } 
         catch (Exception e)
         {
            // ignore.
         }
      }
  -   
  +
   }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to