[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/08/17 13:13:16

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  Support for fastCache
  
  DOESN'T FULLY WORK YET..
  
  I NEED TO GO TO THE OFFICE THOUGH!!!!!!!! (dies in one of the TestBeans test)
  
  Revision  Changes    Path
  1.16      +24 -23    
jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java
  
  Index: JRMPContainerInvoker.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JRMPContainerInvoker.java 2000/08/16 06:44:48     1.15
  +++ JRMPContainerInvoker.java 2000/08/17 20:13:16     1.16
  @@ -40,6 +40,7 @@
   import org.jboss.ejb.ContainerInvokerContainer;
   import org.jboss.ejb.Interceptor;
   import org.jboss.ejb.ContainerInvoker;
  +import org.jboss.util.FastKey;
   import org.jboss.ejb.plugins.jrmp.interfaces.RemoteMethodInvocation;
   import org.jboss.ejb.plugins.jrmp.interfaces.HomeProxy;
   import org.jboss.ejb.plugins.jrmp.interfaces.HomeHandleImpl;
  @@ -71,7 +72,7 @@
    *      @author Rickard �berg ([EMAIL PROTECTED])
    *           @author <a href="mailto:[EMAIL PROTECTED]">Sebastien 
Alborini</a>
    *      @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *      @version $Revision: 1.15 $
  + *      @version $Revision: 1.16 $
    */
   public abstract class JRMPContainerInvoker
      extends RemoteServer
  @@ -118,7 +119,7 @@
   
      public abstract EJBObject getStatefulSessionEJBObject(Object id);
   
  -   public abstract EJBObject getEntityEJBObject(Object id);
  +   public abstract EJBObject getEntityEJBObject(FastKey id);
   
      public abstract Collection getEntityCollection(Collection ids);
      
  @@ -242,44 +243,44 @@
         
         // Create metadata
         
  -       /**
  +      /**
            Constructor signature is  
              
  -              public EJBMetaDataImpl(Class remote, 
  -                                                             Class home, 
  -                                                             Class pkClass,
  -                                                         boolean session, 
  -                                                             boolean 
statelessSession, 
  -                                                             HomeHandle homeHandle)
  +        public EJBMetaDataImpl(Class remote, 
  +                        Class home, 
  +                        Class pkClass,
  +                       boolean session, 
  +                    boolean statelessSession, 
  +                    HomeHandle homeHandle)
          */
  -        
  +       
         if (container.getBeanMetaData() instanceof EntityMetaData)
         {
            ejbMetaData = new EJBMetaDataImpl(
  -                                                                             
((ContainerInvokerContainer)container).getRemoteClass(), 
  -                                                                             
((ContainerInvokerContainer)container).getHomeClass(), 
  -                                                                             
container.getClassLoader().loadClass(((EntityMetaData)container.getBeanMetaData()).getPrimaryKeyClass()),
 
  -                                                                             false, 
//Session 
  -                                                                             false, 
//Stateless
  -                                                                             new 
HomeHandleImpl(jndiName));
  +                            
((ContainerInvokerContainer)container).getRemoteClass(), 
  +                           ((ContainerInvokerContainer)container).getHomeClass(), 
  +                           
container.getClassLoader().loadClass(((EntityMetaData)container.getBeanMetaData()).getPrimaryKeyClass()),
 
  +                           false, //Session 
  +                           false, //Stateless
  +                           new HomeHandleImpl(jndiName));
         }
         else
         {
            if (((SessionMetaData)container.getBeanMetaData()).isStateless()) {
                
               ejbMetaData = new EJBMetaDataImpl(
  -                                                                             
((ContainerInvokerContainer)container).getRemoteClass(), 
  -                                                                             
((ContainerInvokerContainer)container).getHomeClass(), 
  -                                                                             null, 
//No PK
  -                                                                             true, 
//Session
  -                                                                             true, 
//Stateless
  -                                                                             new 
HomeHandleImpl(jndiName));
  +                           ((ContainerInvokerContainer)container).getRemoteClass(), 
  +                           ((ContainerInvokerContainer)container).getHomeClass(), 
  +                           null, //No PK
  +                           true, //Session
  +                           true, //Stateless
  +                           new HomeHandleImpl(jndiName));
            }
            // we are stateful
            else  {
                
               ejbMetaData = new EJBMetaDataImpl(
  -                                                                             
((ContainerInvokerContainer)container).getRemoteClass(), 
  +                           ((ContainerInvokerContainer)container).getRemoteClass(), 
                                           
((ContainerInvokerContainer)container).getHomeClass(), 
                                           null, //No PK 
                                           true, //Session