User: starksm 
  Date: 02/03/03 10:23:08

  Modified:    src/main/org/jboss/ejb/plugins 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:
  Undo the ejbCreate related changes as this was just a brain fart due
  to not reading the spec correctly in response to a bug report.
  
  Revision  Changes    Path
  1.25      +11 -12    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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- AbstractInstancePool.java 3 Mar 2002 17:20:06 -0000       1.24
  +++ AbstractInstancePool.java 3 Mar 2002 18:23:08 -0000       1.25
  @@ -8,7 +8,6 @@
   
   import java.rmi.RemoteException;
   import java.rmi.ServerException;
  -import java.security.Principal;
   import java.util.LinkedList;
   import java.util.Iterator;
   import java.util.Map;
  @@ -41,7 +40,7 @@
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
    *
  - *  @version $Revision: 1.24 $
  + *  @version $Revision: 1.25 $
    *
    *  <p><b>Revisions:</b>
    *  <p><b>20010704 marcf:</b>
  @@ -63,7 +62,7 @@
    *  </ul>
    */
   public abstract class AbstractInstancePool
  -   implements InstancePool, XmlLoadable
  +implements InstancePool, XmlLoadable
   {
      // Constants -----------------------------------------------------
   
  @@ -155,10 +154,10 @@
      /**
       * Add a instance in the pool
       */
  -   public void add(Principal callerPrincipal)
  -      throws Exception
  +   public void add()
  +   throws Exception
      {
  -      EnterpriseContext ctx = create(container.createBeanClassInstance(), 
callerPrincipal);
  +      EnterpriseContext ctx = create(container.createBeanClassInstance());
         if( log.isTraceEnabled() )
            log.trace("Add instance "+this+"#"+ctx);
         synchronized (pool)
  @@ -174,8 +173,8 @@
       * @return     Context /w instance
       * @exception   RemoteException
       */
  -   public EnterpriseContext get(Principal callerPrincipal)
  -      throws Exception
  +   public EnterpriseContext get()
  +   throws Exception
      {
         if( log.isTraceEnabled() )
            log.trace("Get instance 
"+this+"#"+pool.isEmpty()+"#"+getContainer().getBeanClass());
  @@ -207,7 +206,7 @@
                     poolFeeder.start();
                  }
               }
  -            return create(container.createBeanClassInstance(), callerPrincipal);
  +            return create(container.createBeanClassInstance());
            } catch (InstantiationException e)
            {
               throw new ServerException("Could not instantiate bean", e);
  @@ -240,8 +239,7 @@
         ctx.clear();
   
         // If (!reclaim), we do not reuse but create a brand new instance simplifies 
the design
  -      try
  -      {
  +      try {
            mReadyBean.add();
            if (this.reclaim)
            {
  @@ -347,8 +345,8 @@
      // Package protected ---------------------------------------------
   
      // Protected -----------------------------------------------------
  -   protected abstract EnterpriseContext create(Object instance, Principal 
callerPrincipal)
  -      throws Exception;
  +   protected abstract EnterpriseContext create(Object instance)
  +   throws Exception;
   
      // Private -------------------------------------------------------
   
  @@ -370,3 +368,4 @@
      // Inner classes -------------------------------------------------
   
   }
  +
  
  
  
  1.13      +1 -1      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EntityInstanceCache.java  3 Mar 2002 17:20:06 -0000       1.12
  +++ EntityInstanceCache.java  3 Mar 2002 18:23:08 -0000       1.13
  @@ -21,7 +21,7 @@
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
    * @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    *
    * <p><b>Revisions:</b>
    * <p><b>2001/01/29: billb</b>
  @@ -124,7 +124,7 @@
        }
        protected EnterpriseContext acquireContext() throws Exception
        {
  -             return m_container.getInstancePool().get(null);
  +             return m_container.getInstancePool().get();
        }
        protected void freeContext(EnterpriseContext ctx)
        {
  
  
  
  1.50      +2 -3      
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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- EntityInstanceInterceptor.java    3 Mar 2002 17:20:06 -0000       1.49
  +++ EntityInstanceInterceptor.java    3 Mar 2002 18:23:08 -0000       1.50
  @@ -42,7 +42,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.49 $
  +* @version $Revision: 1.50 $
   *
   * <p><b>Revisions:</b><br>
   * <p><b>2001/06/28: marcf</b>
  @@ -121,8 +121,7 @@
         throws Exception
      {
         // Get context
  -      InstancePool pool = container.getInstancePool();
  -      EntityEnterpriseContext ctx = (EntityEnterpriseContext) 
pool.get(mi.getPrincipal());
  +      EntityEnterpriseContext ctx = 
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
   
                // Pass it to the method invocation
         mi.setEnterpriseContext(ctx);
  @@ -131,7 +130,7 @@
         ctx.setTransaction(mi.getTransaction());
   
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
   
            // Invoke through interceptors
         Object rtn = getNext().invokeHome(mi);
  
  
  
  1.20      +2 -4      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- EntityInstancePool.java   3 Mar 2002 17:20:06 -0000       1.19
  +++ EntityInstancePool.java   3 Mar 2002 18:23:08 -0000       1.20
  @@ -6,8 +6,6 @@
    */
   package org.jboss.ejb.plugins;
   
  -import java.security.Principal;
  -
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.EntityEnterpriseContext;
   
  @@ -19,7 +17,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.19 $
  + *   @version $Revision: 1.20 $
    *      
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -81,13 +79,13 @@
      // Package protected ---------------------------------------------
       
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance, Principal ignored)
  +   protected EnterpriseContext create(Object instance)
         throws Exception
      {
         mInstantiate.add();
         return new EntityEnterpriseContext(instance, getContainer());
      }
  -
  +    
      // Private -------------------------------------------------------
   
      // Inner classes -------------------------------------------------
  
  
  
  1.7       +9 -6      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EntityMultiInstanceInterceptor.java       3 Mar 2002 17:20:06 -0000       1.6
  +++ EntityMultiInstanceInterceptor.java       3 Mar 2002 18:23:08 -0000       1.7
  @@ -17,13 +17,15 @@
   import org.jboss.invocation.Invocation;
   import org.jboss.ejb.CacheKey;
   
  +import org.jboss.security.SecurityAssociation;
  +
   /**
    * The instance interceptors role is to acquire a context representing
    * the target object from the cache.
    *
    *    
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    *
    * <p><b>Revisions:</b><br>
    * <p><b>2001/08/08: billb</b>
  @@ -62,8 +64,7 @@
         throws Exception
      {
         // Get context
  -      InstancePool pool = container.getInstancePool();
  -      EntityEnterpriseContext ctx = (EntityEnterpriseContext) 
pool.get(mi.getPrincipal());
  +      EntityEnterpriseContext ctx = 
(EntityEnterpriseContext)((EntityContainer)getContainer()).getInstancePool().get();
   
                // Pass it to the method invocation
         mi.setEnterpriseContext(ctx);
  @@ -72,7 +73,7 @@
         ctx.setTransaction(mi.getTransaction());
   
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
   
         // Invoke through interceptors
         return getNext().invokeHome(mi);
  @@ -92,8 +93,7 @@
         }
         if (ctx == null)
         {
  -         InstancePool pool = container.getInstancePool();
  -         ctx = (EntityEnterpriseContext) pool.get(mi.getPrincipal());
  +         ctx = (EntityEnterpriseContext)container.getInstancePool().get();
            ctx.setCacheKey(key);
            ctx.setId(key.getId());
            container.getPersistenceManager().activateEntity(ctx);
  @@ -107,7 +107,7 @@
         ctx.setTransaction(mi.getTransaction());
   
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
   
         // Set context on the method invocation
         mi.setEnterpriseContext(ctx);
  @@ -116,3 +116,6 @@
      }
   
   }
  +
  +
  +
  
  
  
  1.12      +4 -2      
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MessageDrivenInstanceInterceptor.java     3 Mar 2002 17:20:06 -0000       1.11
  +++ MessageDrivenInstanceInterceptor.java     3 Mar 2002 18:23:08 -0000       1.12
  @@ -14,6 +14,8 @@
   import org.jboss.invocation.Invocation;
   import org.jboss.ejb.EnterpriseContext;
   
  +import org.jboss.security.SecurityAssociation;
  +
   /**
    * This container acquires the given instance. This must be used after
    * the EnvironmentInterceptor, since acquiring instances requires a proper
  @@ -22,7 +24,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class MessageDrivenInstanceInterceptor
      extends AbstractInterceptor
  @@ -69,10 +71,10 @@
         throws Exception
      {
         // Get context
  -      EnterpriseContext ctx = container.getInstancePool().get(mi.getPrincipal());
  +      EnterpriseContext ctx = container.getInstancePool().get();
   
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
   
         // Use this context
         mi.setEnterpriseContext(ctx);
  
  
  
  1.11      +7 -2      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MessageDrivenInstancePool.java    3 Mar 2002 17:20:06 -0000       1.10
  +++ MessageDrivenInstancePool.java    3 Mar 2002 18:23:08 -0000       1.11
  @@ -6,7 +6,6 @@
    */
   package org.jboss.ejb.plugins;
   
  -import java.security.Principal;
   
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.MessageDrivenEnterpriseContext;
  @@ -19,7 +18,7 @@
    *      @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
    * @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.10 $
  + *   @version $Revision: 1.11 $
    *      
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -56,7 +55,7 @@
      // Package protected ---------------------------------------------
       
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance, Principal ignored)
  +   protected EnterpriseContext create(Object instance)
         throws Exception
      {
         mInstantiate.add();
  @@ -68,3 +67,9 @@
      // Inner classes -------------------------------------------------
   
   }
  +
  +
  +
  +
  +
  +
  
  
  
  1.19      +6 -6      
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- SingletonStatelessSessionInstancePool.java        3 Mar 2002 17:20:06 -0000      
 1.18
  +++ SingletonStatelessSessionInstancePool.java        3 Mar 2002 18:23:08 -0000      
 1.19
  @@ -8,7 +8,6 @@
   
   import java.rmi.RemoteException;
   import java.rmi.ServerException;
  -import java.security.Principal;
   import java.util.Map;
   import java.util.HashMap;
   
  @@ -30,7 +29,7 @@
    *
    *  @see <related>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
  - *  @version $Revision: 1.18 $
  + *  @version $Revision: 1.19 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -103,7 +102,7 @@
       * @return     Context /w instance
       * @exception   RemoteException
       */
  -   public synchronized EnterpriseContext get(Principal caller)
  +   public synchronized EnterpriseContext get()
         throws Exception
      {
         // Wait while someone else is using it
  @@ -118,7 +117,7 @@
            try
            {
               mInstantiate.add();
  -            ctx = create(con.createBeanClassInstance(), con, caller);
  +            ctx = create(con.createBeanClassInstance(), con);
            } catch (InstantiationException e)
            {
               throw new ServerException("Could not instantiate bean", e);
  @@ -175,7 +174,7 @@
      /**
       * Add a instance in the pool
       */
  -   public void add(Principal caller)
  +   public void add()
         throws Exception
      {
         // Empty
  @@ -218,10 +217,10 @@
      // Package protected ---------------------------------------------
   
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance, Container con, Principal 
caller)
  +   protected EnterpriseContext create(Object instance, Container con)
         throws Exception
      {
  -      return new StatelessSessionEnterpriseContext(instance, con, caller);
  +      return new StatelessSessionEnterpriseContext(instance, con);
      }
   
      // Private -------------------------------------------------------
  @@ -229,3 +228,4 @@
      // Inner classes -------------------------------------------------
   
   }
  +
  
  
  
  1.17      +1 -1      
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- StatefulSessionInstanceCache.java 3 Mar 2002 17:20:06 -0000       1.16
  +++ StatefulSessionInstanceCache.java 3 Mar 2002 18:23:08 -0000       1.17
  @@ -30,7 +30,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public class StatefulSessionInstanceCache
       extends AbstractInstanceCache
  @@ -72,7 +72,7 @@
       }
       protected EnterpriseContext acquireContext() throws Exception
       {
  -        return m_container.getInstancePool().get(null);
  +        return m_container.getInstancePool().get();
       }
       protected void freeContext(EnterpriseContext ctx)
       {
  
  
  
  1.30      +3 -3      
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- StatefulSessionInstanceInterceptor.java   3 Mar 2002 17:20:06 -0000       1.29
  +++ StatefulSessionInstanceInterceptor.java   3 Mar 2002 18:23:08 -0000       1.30
  @@ -37,7 +37,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.29 $
  + * @version $Revision: 1.30 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010704 marcf</b>
  @@ -110,8 +110,8 @@
         // Get context
         
         // get a new context from the pool (this is a home method call)
  -      InstancePool pool = container.getInstancePool();
  -      EnterpriseContext ctx = pool.get(mi.getPrincipal());
  +      EnterpriseContext ctx = container.getInstancePool().get();
  +      
         
         // set the context on the Invocation
         mi.setEnterpriseContext(ctx);
  @@ -120,7 +120,7 @@
         ctx.lock();
         
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
         
         try
         {
  
  
  
  1.9       +3 -3      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StatefulSessionInstancePool.java  3 Mar 2002 17:20:07 -0000       1.8
  +++ StatefulSessionInstancePool.java  3 Mar 2002 18:23:08 -0000       1.9
  @@ -6,7 +6,6 @@
   */
   package org.jboss.ejb.plugins;
   
  -import java.security.Principal;
   
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.StatefulSessionEnterpriseContext;
  @@ -17,7 +16,7 @@
   *    @see <related>
   *   @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
  -*    @version $Revision: 1.8 $
  +*    @version $Revision: 1.9 $
   *      
   * <p><b>Revisions:</b>
   * <p><b>20010718 andreas schaefer:</b>
  @@ -44,8 +43,8 @@
        }
        
        // Protected -----------------------------------------------------
  -     protected EnterpriseContext create(Object instance, Principal ignored)
  -     throws Exception
  +     protected EnterpriseContext create(Object instance)
  +     throws Exception
        {
         mInstantiate.add();
                // The instance is created by the caller and is a newInstance();
  @@ -57,3 +56,4 @@
        // Inner classes -------------------------------------------------
   
   }
  +
  
  
  
  1.13      +5 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- StatelessSessionInstanceInterceptor.java  3 Mar 2002 17:20:07 -0000       1.12
  +++ StatelessSessionInstanceInterceptor.java  3 Mar 2002 18:23:08 -0000       1.13
  @@ -13,13 +13,16 @@
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.StatelessSessionContainer;
   
  +import org.jboss.security.SecurityAssociation;
  +
  +
   /**
    * This container acquires the given instance. This must be used after
    * the EnvironmentInterceptor, since acquiring instances requires a proper
    * JNDI environment to be set
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class StatelessSessionInstanceInterceptor
      extends AbstractInterceptor
  @@ -57,10 +60,10 @@
      public Object invoke(final Invocation mi) throws Exception
      {
         // Get context
  -      EnterpriseContext ctx = container.getInstancePool().get(mi.getPrincipal());
  +      EnterpriseContext ctx = container.getInstancePool().get();
   
         // Set the current security information
  -      ctx.setPrincipal(mi.getPrincipal());
  +      ctx.setPrincipal(SecurityAssociation.getPrincipal());
   
         // Use this context
         mi.setEnterpriseContext(ctx);
  
  
  
  1.12      +3 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StatelessSessionInstancePool.java 3 Mar 2002 17:20:07 -0000       1.11
  +++ StatelessSessionInstancePool.java 3 Mar 2002 18:23:08 -0000       1.12
  @@ -6,7 +6,7 @@
    */
   package org.jboss.ejb.plugins;
   
  -import java.security.Principal;
  +
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.StatelessSessionEnterpriseContext;
   
  @@ -17,7 +17,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.11 $
  + *   @version $Revision: 1.12 $
    *      
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  @@ -54,11 +54,11 @@
      // Package protected ---------------------------------------------
       
      // Protected -----------------------------------------------------
  -   protected EnterpriseContext create(Object instance, Principal callerPrincipal)
  +   protected EnterpriseContext create(Object instance)
         throws Exception
      {
         mInstantiate.add();
  -      return new StatelessSessionEnterpriseContext(instance, getContainer(), 
callerPrincipal);
  +      return new StatelessSessionEnterpriseContext(instance, getContainer());
      }
       
      // Private -------------------------------------------------------
  
  
  
  1.4       +1 -2      
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TimedInstancePoolFeeder.java      3 Mar 2002 17:20:07 -0000       1.3
  +++ TimedInstancePoolFeeder.java      3 Mar 2002 18:23:08 -0000       1.4
  @@ -51,8 +51,7 @@
            {
               for (int i=0 ; i < increment ; i++)
               {
  -               // This may not work with secured stateless sessions
  -               ip.add(null);
  +               ip.add();
               }
            }
         }
  
  
  

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

Reply via email to