User: starksm 
  Date: 02/03/02 22:51:07

  Modified:    src/main/org/jboss/ejb/plugins Tag: Branch_2_4
                        AbstractInstancePool.java EntityInstanceCache.java
                        EntityInstanceInterceptor.java
                        EntityInstancePool.java
                        EntityMultiInstanceInterceptor.java
                        MessageDrivenInstanceInterceptor.java
                        MessageDrivenInstancePool.java
                        SingletonStatelessSessionInstancePool.java
                        StatefulSessionInstanceCache.java
                        StatefulSessionInstanceInterceptor.java
                        StatefulSessionInstancePool.java
                        StatelessSessionInstanceInterceptor.java
                        StatelessSessionInstancePool.java
                        TimedInstancePoolFeeder.java
  Log:
  Adding an instance to the pool needs to be done with the method
  caller principal in case ejbCreate makes use of the context
  getCallerPrincipal.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.6.7   +10 -9     jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java
  
  Index: AbstractInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java,v
  retrieving revision 1.9.6.6
  retrieving revision 1.9.6.7
  diff -u -r1.9.6.6 -r1.9.6.7
  --- AbstractInstancePool.java 28 Dec 2001 22:35:13 -0000      1.9.6.6
  +++ AbstractInstancePool.java 3 Mar 2002 06:51:07 -0000       1.9.6.7
  @@ -6,11 +6,12 @@
   */
   package org.jboss.ejb.plugins;
   
  +import java.lang.reflect.Constructor;
   import java.rmi.RemoteException;
   import java.rmi.ServerException;
  +import java.security.Principal;
   import java.util.Stack;
   import java.util.Iterator;
  -import java.lang.reflect.Constructor;
   
   import org.jboss.ejb.Container;
   import org.jboss.ejb.InstancePool;
  @@ -36,7 +37,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark/a>
    *
  - * @version $Revision: 1.9.6.6 $
  + * @version $Revision: 1.9.6.7 $
    *
    *  <p><b>Revisions:</b>
    *  <p><b>20010704 marcf:</b>
  @@ -144,13 +145,13 @@
       bean instance.
       @exception Exception, thrown on ctx creation failure
       */
  -   public void add()
  +   public void add(Principal callerPrincipal)
         throws Exception
      {
         EnterpriseContext ctx = null;
         try
         {
  -         ctx = create(container.createBeanClassInstance());
  +         ctx = create(container.createBeanClassInstance(), callerPrincipal);
         }
         catch (InstantiationException e)
         {
  @@ -172,7 +173,7 @@
       @return Context with instance
       @exception RemoteException
      */
  -   public EnterpriseContext get()
  +   public EnterpriseContext get(Principal callerPrincipal)
         throws Exception
      {
         boolean trace = log.isTraceEnabled();
  @@ -188,7 +189,7 @@
            if( acquired == false )
               throw new ServerException("Failed to acquire the pool semaphore, 
strictTimeout="+strictTimeout);
         }
  -      EnterpriseContext ctx = internalGet();
  +      EnterpriseContext ctx = internalGet(callerPrincipal);
         return ctx;
      }
   
  @@ -196,7 +197,7 @@
       if strictMaxSize is being used. This method obtains a ctx from the
       pool if it is not empty, else a new ctx is created by calling add().
       */
  -   private synchronized EnterpriseContext internalGet()
  +   private synchronized EnterpriseContext internalGet(Principal callerPrincipal)
         throws Exception
      {
         EnterpriseContext ctx = null;
  @@ -213,7 +214,7 @@
               log.debug("The Pool for " + container.getBeanClass().getName()
                  + " has been overloaded.  You should change pool parameters.");
            }
  -         add();
  +         add(callerPrincipal);
            ctx = (EnterpriseContext) pool.pop();
         }
   
  @@ -360,7 +361,7 @@
      // Package protected ---------------------------------------------
   
        // Protected -----------------------------------------------------
  -   protected abstract EnterpriseContext create(Object instance)
  +   protected abstract EnterpriseContext create(Object instance, Principal 
createCaller)
         throws Exception;
   
      // Private -------------------------------------------------------
  
  
  
  1.7.2.2   +2 -2      jboss/src/main/org/jboss/ejb/plugins/EntityInstanceCache.java
  
  Index: EntityInstanceCache.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceCache.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- EntityInstanceCache.java  4 Sep 2001 01:51:07 -0000       1.7.2.1
  +++ EntityInstanceCache.java  3 Mar 2002 06:51:07 -0000       1.7.2.2
  @@ -21,7 +21,7 @@
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
    * @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
  - * @version $Revision: 1.7.2.1 $
  + * @version $Revision: 1.7.2.2 $
    */
   public class EntityInstanceCache
        extends AbstractInstanceCache 
  @@ -109,7 +109,7 @@
        }
        protected EnterpriseContext acquireContext() throws Exception
        {
  -             return m_container.getInstancePool().get();
  +             return m_container.getInstancePool().get(null);
        }
        protected void freeContext(EnterpriseContext ctx)
        {
  
  
  
  1.30.2.7  +6 -4      
jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
  
  Index: EntityInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java,v
  retrieving revision 1.30.2.6
  retrieving revision 1.30.2.7
  diff -u -r1.30.2.6 -r1.30.2.7
  --- EntityInstanceInterceptor.java    20 Nov 2001 09:42:49 -0000      1.30.2.6
  +++ EntityInstanceInterceptor.java    3 Mar 2002 06:51:07 -0000       1.30.2.7
  @@ -55,7 +55,7 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  -* @version $Revision: 1.30.2.6 $
  +* @version $Revision: 1.30.2.7 $
   *
   * <p><b>Revisions:</b><br>
   * <p><b>2001/06/28: marcf</b>
  @@ -133,8 +133,9 @@
         throws Exception
      {
         // Get context
  -      EntityEnterpriseContext ctx = 
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
  -             
  +      InstancePool pool = container.getInstancePool();
  +      EntityEnterpriseContext ctx = 
(EntityEnterpriseContext)pool.get(mi.getPrincipal());
  +
                // Pass it to the method invocation
         mi.setEnterpriseContext(ctx);
                
  @@ -178,7 +179,8 @@
         CacheKey key = (CacheKey) mi.getId();
                
         // The context
  -      EntityEnterpriseContext ctx = (EntityEnterpriseContext) 
container.getInstanceCache().get(key);
  +      InstanceCache cache = container.getInstanceCache();
  +      EntityEnterpriseContext ctx = (EntityEnterpriseContext)cache.get(key);
                
         boolean trace = log.isTraceEnabled();
         if( trace ) log.trace("Begin invoke, key="+key);
  
  
  
  1.9.6.5   +4 -3      jboss/src/main/org/jboss/ejb/plugins/EntityInstancePool.java
  
  Index: EntityInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstancePool.java,v
  retrieving revision 1.9.6.4
  retrieving revision 1.9.6.5
  diff -u -r1.9.6.4 -r1.9.6.5
  --- EntityInstancePool.java   27 Dec 2001 19:41:16 -0000      1.9.6.4
  +++ EntityInstancePool.java   3 Mar 2002 06:51:07 -0000       1.9.6.5
  @@ -7,6 +7,7 @@
   package org.jboss.ejb.plugins;
   
   import java.rmi.RemoteException;
  +import java.security.Principal;
   
   import javax.ejb.EJBException;
   
  @@ -23,7 +24,7 @@
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.9.6.4 $
  + *   @version $Revision: 1.9.6.5 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -80,10 +81,10 @@
      // Package protected ---------------------------------------------
   
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance)
  +   protected EnterpriseContext create(Object instance, Principal createCaller)
         throws Exception
      {
  -      return new EntityEnterpriseContext(instance, getContainer());
  +      return new EntityEnterpriseContext(instance, getContainer(), createCaller);
      }
   
      // Private -------------------------------------------------------
  
  
  
  1.1.4.4   +6 -4      
jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
  
  Index: EntityMultiInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java,v
  retrieving revision 1.1.4.3
  retrieving revision 1.1.4.4
  diff -u -r1.1.4.3 -r1.1.4.4
  --- EntityMultiInstanceInterceptor.java       20 Nov 2001 09:42:50 -0000      1.1.4.3
  +++ EntityMultiInstanceInterceptor.java       3 Mar 2002 06:51:07 -0000       1.1.4.4
  @@ -44,7 +44,7 @@
    *
    *    
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  - * @version $Revision: 1.1.4.3 $
  + * @version $Revision: 1.1.4.4 $
    *
    * <p><b>Revisions:</b><br>
    * <p><b>2001/08/08: billb</b>
  @@ -81,8 +81,9 @@
         throws Exception
      {
         // Get context
  -      EntityEnterpriseContext ctx = 
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
  -             
  +      InstancePool pool = container.getInstancePool();
  +      EntityEnterpriseContext ctx = (EntityEnterpriseContext) 
pool.get(mi.getPrincipal());
  +
                // Pass it to the method invocation
         mi.setEnterpriseContext(ctx);
                
  @@ -107,7 +108,8 @@
         }
         if (ctx == null)
         {
  -         ctx = (EntityEnterpriseContext)container.getInstancePool().get();
  +         InstancePool pool = container.getInstancePool();
  +         ctx = (EntityEnterpriseContext) pool.get(mi.getPrincipal());
            ctx.setCacheKey(key);
            ctx.setId(key.getId());
            container.getPersistenceManager().activateEntity(ctx);
  
  
  
  1.3.6.3   +3 -3      
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
  
  Index: MessageDrivenInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java,v
  retrieving revision 1.3.6.2
  retrieving revision 1.3.6.3
  diff -u -r1.3.6.2 -r1.3.6.3
  --- MessageDrivenInstanceInterceptor.java     28 Dec 2001 22:35:13 -0000      1.3.6.2
  +++ MessageDrivenInstanceInterceptor.java     3 Mar 2002 06:51:07 -0000       1.3.6.3
  @@ -22,7 +22,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
  - * @version $Revision: 1.3.6.2 $
  + * @version $Revision: 1.3.6.3 $
    */
   public class MessageDrivenInstanceInterceptor
      extends AbstractInterceptor
  @@ -70,9 +70,9 @@
      {
         // Get context
         InstancePool pool = container.getInstancePool();
  -      EnterpriseContext ctx = pool.get();
  +      EnterpriseContext ctx = pool.get(mi.getPrincipal());
         mi.setEnterpriseContext(ctx);
  -      
  +
         // There is no need for synchronization since the instance is always
         // fresh also there should never be a tx associated with the instance.
         try
  
  
  
  1.3.6.2   +4 -4      
jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java
  
  Index: MessageDrivenInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/MessageDrivenInstancePool.java,v
  retrieving revision 1.3.6.1
  retrieving revision 1.3.6.2
  diff -u -r1.3.6.1 -r1.3.6.2
  --- MessageDrivenInstancePool.java    20 Sep 2001 22:19:00 -0000      1.3.6.1
  +++ MessageDrivenInstancePool.java    3 Mar 2002 06:51:07 -0000       1.3.6.2
  @@ -7,7 +7,7 @@
   package org.jboss.ejb.plugins;
   
   import java.rmi.RemoteException;
  -
  +import java.security.Principal;
   import org.jboss.ejb.Container;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.MessageDrivenEnterpriseContext;
  @@ -19,7 +19,7 @@
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *      @author Peter Antman ([EMAIL PROTECTED])
    *    @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.3.6.1 $
  + *   @version $Revision: 1.3.6.2 $
    *
    *  <p><b>Revisions:</b>
    *  <p><b>20010920 Sacha Labourey:</b>
  @@ -52,10 +52,10 @@
      // Package protected ---------------------------------------------
   
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance)
  +   protected EnterpriseContext create(Object instance, Principal createCaller)
         throws Exception
      {
  -      return new MessageDrivenEnterpriseContext(instance, getContainer());
  +      return new MessageDrivenEnterpriseContext(instance, getContainer(), 
createCaller);
      }
   
      // Private -------------------------------------------------------
  
  
  
  1.6.6.4   +9 -8      
jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java
  
  Index: SingletonStatelessSessionInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java,v
  retrieving revision 1.6.6.3
  retrieving revision 1.6.6.4
  diff -u -r1.6.6.3 -r1.6.6.4
  --- SingletonStatelessSessionInstancePool.java        27 Dec 2001 19:41:16 -0000     
 1.6.6.3
  +++ SingletonStatelessSessionInstancePool.java        3 Mar 2002 06:51:07 -0000      
 1.6.6.4
  @@ -8,9 +8,10 @@
   
   import java.rmi.RemoteException;
   import java.rmi.ServerException;
  -
  +import java.security.Principal;
   import javax.ejb.EJBHome;
   
  +import org.w3c.dom.Element;
   import org.jboss.deployment.DeploymentException;
   import org.jboss.ejb.Container;
   import org.jboss.ejb.InstancePool;
  @@ -18,7 +19,6 @@
   import org.jboss.ejb.StatelessSessionEnterpriseContext;
   import org.jboss.metadata.XmlLoadable;
   import org.jboss.metadata.MetaData;
  -import org.w3c.dom.Element;
   import org.jboss.logging.Logger;
   
   
  @@ -28,7 +28,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.6.6.3 $
  + *   @version $Revision: 1.6.6.4 $
    */
   public class SingletonStatelessSessionInstancePool
      implements InstancePool, XmlLoadable
  @@ -83,7 +83,7 @@
       * @return     Context /w instance
       * @exception   RemoteException  
       */
  -   public synchronized EnterpriseContext get()
  +   public synchronized EnterpriseContext get(Principal callerPrincipal)
         throws Exception
      {
         // Wait while someone else is using it
  @@ -97,7 +97,7 @@
         {
            try
            {
  -            ctx = create(con.getBeanClass().newInstance(), con);
  +            ctx = create(con.getBeanClass().newInstance(), con, callerPrincipal);
            } catch (InstantiationException e)
            {
               throw new ServerException("Could not instantiate bean", e);
  @@ -147,7 +147,7 @@
      /**
       * Add a instance in the pool
       */
  -   public void add()
  +   public void add(Principal callerPrincipal)
         throws Exception
      {
         // Empty
  @@ -173,10 +173,11 @@
      // Package protected ---------------------------------------------
       
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance, Container con)
  +   protected EnterpriseContext create(Object instance, Container con,
  +      Principal createCaller)
         throws Exception
      {
  -      return new StatelessSessionEnterpriseContext(instance, con);
  +      return new StatelessSessionEnterpriseContext(instance, con, createCaller);
      }
      
      // Private -------------------------------------------------------
  
  
  
  1.7.2.3   +2 -2      
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
  
  Index: StatefulSessionInstanceCache.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- StatefulSessionInstanceCache.java 20 Nov 2001 09:42:50 -0000      1.7.2.2
  +++ StatefulSessionInstanceCache.java 3 Mar 2002 06:51:07 -0000       1.7.2.3
  @@ -31,7 +31,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
  - * @version $Revision: 1.7.2.2 $
  + * @version $Revision: 1.7.2.3 $
    */
   public class StatefulSessionInstanceCache
      extends AbstractInstanceCache
  @@ -74,7 +74,7 @@
      }
      protected EnterpriseContext acquireContext() throws Exception
      {
  -      return m_container.getInstancePool().get();
  +      return m_container.getInstancePool().get(null);
      }
      protected void freeContext(EnterpriseContext ctx)
      {
  
  
  
  1.15.6.3  +11 -2     
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
  
  Index: StatefulSessionInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java,v
  retrieving revision 1.15.6.2
  retrieving revision 1.15.6.3
  diff -u -r1.15.6.2 -r1.15.6.3
  --- StatefulSessionInstanceInterceptor.java   28 Dec 2001 22:35:13 -0000      
1.15.6.2
  +++ StatefulSessionInstanceInterceptor.java   3 Mar 2002 06:51:07 -0000       
1.15.6.3
  @@ -30,6 +30,7 @@
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.MethodInvocation;
   import org.jboss.metadata.SessionMetaData;
  +import org.jboss.security.SecurityAssociation;
   
   /**
    * This container acquires the given instance. 
  @@ -38,7 +39,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
  - * @version $Revision: 1.15.6.2 $
  + * @version $Revision: 1.15.6.3 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010704 marcf</b>
  @@ -106,7 +107,7 @@
      { 
         // get a new context from the pool (this is a home method call)
         InstancePool pool = container.getInstancePool();
  -      EnterpriseContext ctx = pool.get();
  +      EnterpriseContext ctx = pool.get(mi.getPrincipal());
   
         // set the context on the methodInvocation
         mi.setEnterpriseContext(ctx);
  @@ -189,6 +190,14 @@
            lock.sync(); // synchronized(ctx)
            try // lock.sync
            {
  +            /* The security context must be established before the cache
  +            lookup because the SecurityInterceptor is after the instance
  +            interceptor and handles of passivated sessions expect that they are
  +            restored with the correct security context since the handles
  +            not serialize the principal and credential information.
  +            */
  +            SecurityAssociation.setPrincipal(mi.getPrincipal());
  +            SecurityAssociation.setCredential(mi.getCredential());
               // Get context
               ctx = cache.get(methodID);
               // Associate it with the method invocation
  
  
  
  1.4.6.2   +5 -4      
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstancePool.java
  
  Index: StatefulSessionInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstancePool.java,v
  retrieving revision 1.4.6.1
  retrieving revision 1.4.6.2
  diff -u -r1.4.6.1 -r1.4.6.2
  --- StatefulSessionInstancePool.java  4 Sep 2001 01:51:07 -0000       1.4.6.1
  +++ StatefulSessionInstancePool.java  3 Mar 2002 06:51:07 -0000       1.4.6.2
  @@ -7,6 +7,7 @@
   package org.jboss.ejb.plugins;
   
   import java.rmi.RemoteException;
  +import java.security.Principal;
   
   import org.jboss.ejb.Container;
   import org.jboss.ejb.EnterpriseContext;
  @@ -18,7 +19,7 @@
   *    @see <related>
   *   @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
  -*    @version $Revision: 1.4.6.1 $
  +*    @version $Revision: 1.4.6.2 $
   *      
   * <p><b>Revisions:</b>
   * <p><b>20010718 andreas schaefer:</b>
  @@ -45,13 +46,13 @@
      }
        
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance)
  +   protected EnterpriseContext create(Object instance, Principal createCaller)
         throws Exception
      {
         // The instance is created by the caller and is a newInstance();
  -      return new StatefulSessionEnterpriseContext(instance, getContainer());
  +      return new StatefulSessionEnterpriseContext(instance, getContainer(), 
createCaller);
      }
  -     
  +
      // Private -------------------------------------------------------
        
      // Inner classes -------------------------------------------------
  
  
  
  1.6.6.3   +2 -2      
jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
  
  Index: StatelessSessionInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java,v
  retrieving revision 1.6.6.2
  retrieving revision 1.6.6.3
  diff -u -r1.6.6.2 -r1.6.6.3
  --- StatelessSessionInstanceInterceptor.java  28 Dec 2001 22:35:14 -0000      1.6.6.2
  +++ StatelessSessionInstanceInterceptor.java  3 Mar 2002 06:51:07 -0000       1.6.6.3
  @@ -33,7 +33,7 @@
    *
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.6.6.2 $
  + *   @version $Revision: 1.6.6.3 $
    */
   public class StatelessSessionInstanceInterceptor
      extends AbstractInterceptor
  @@ -71,7 +71,7 @@
      {
         // Get context
         InstancePool pool = container.getInstancePool();
  -      EnterpriseContext ctx = pool.get();
  +      EnterpriseContext ctx = pool.get(mi.getPrincipal());
         mi.setEnterpriseContext(ctx);
   
         // There is no need for synchronization since the instance is always fresh 
also there should
  
  
  
  1.4.6.3   +4 -3      
jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstancePool.java
  
  Index: StatelessSessionInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatelessSessionInstancePool.java,v
  retrieving revision 1.4.6.2
  retrieving revision 1.4.6.3
  diff -u -r1.4.6.2 -r1.4.6.3
  --- StatelessSessionInstancePool.java 20 Sep 2001 22:19:00 -0000      1.4.6.2
  +++ StatelessSessionInstancePool.java 3 Mar 2002 06:51:07 -0000       1.4.6.3
  @@ -7,6 +7,7 @@
   package org.jboss.ejb.plugins;
   
   import java.rmi.RemoteException;
  +import java.security.Principal;
   
   import org.jboss.ejb.Container;
   import org.jboss.ejb.EnterpriseContext;
  @@ -19,7 +20,7 @@
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.4.6.2 $
  + *   @version $Revision: 1.4.6.3 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -56,10 +57,10 @@
      // Package protected ---------------------------------------------
   
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance)
  +   protected EnterpriseContext create(Object instance, Principal createCaller)
         throws Exception
      {
  -      return new StatelessSessionEnterpriseContext(instance, getContainer());
  +      return new StatelessSessionEnterpriseContext(instance, getContainer(), 
createCaller);
      }
   
      // Private -------------------------------------------------------
  
  
  
  1.1.2.3   +2 -1      
jboss/src/main/org/jboss/ejb/plugins/TimedInstancePoolFeeder.java
  
  Index: TimedInstancePoolFeeder.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/TimedInstancePoolFeeder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- TimedInstancePoolFeeder.java      27 Dec 2001 19:41:16 -0000      1.1.2.2
  +++ TimedInstancePoolFeeder.java      3 Mar 2002 06:51:07 -0000       1.1.2.3
  @@ -50,7 +50,8 @@
            {
               for (int i=0 ; i < increment ; i++)
               {
  -               ip.add();
  +               // This may fail for a secured stateless bean
  +               ip.add(null);
               }
            }
         }
  
  
  

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

Reply via email to