[openejb-scm] openejb/modules/core/src/java/org/openejb AbstractInstanceContext.java

[djencks]

djencks     2005/02/04 21:36:23

  Modified:    modules/core/src/java/org/openejb
                        AbstractInstanceContext.java
  Log:

  Don't try to construct invalid EJBInvocations, or expect an AssertionError if 
you do.
  
  Revision  Changes    Path
  1.6       +2 -14     
openejb/modules/core/src/java/org/openejb/AbstractInstanceContext.java
  
  Index: AbstractInstanceContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractInstanceContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractInstanceContext.java      20 Jul 2004 23:40:01 -0000      1.5
  +++ AbstractInstanceContext.java      5 Feb 2005 02:36:23 -0000       1.6
  @@ -45,8 +45,6 @@
       //this not being final sucks, but the CMP instance is not available 
until after the superclass constructor executes.
       protected EnterpriseBean instance;
       private final EJBProxyFactory proxyFactory;
  -    private final EJBInvocation ejbActivateInvocation;
  -    private final EJBInvocation ejbPassivateInvocation;
       //initialized in subclass, can't be final :-((
       protected EJBInvocation setContextInvocation;
       protected EJBInvocation unsetContextInvocation;
  @@ -54,14 +52,12 @@
       private final TimerService timerService;
   
   
  -    public AbstractInstanceContext(SystemMethodIndices systemMethodIndices, 
Interceptor systemChain, Set unshareableResources, Set 
applicationManagedSecurityResources, EnterpriseBean instance, EJBProxyFactory 
proxyFactory, BasicTimerService timerService) {
  +    public AbstractInstanceContext(Interceptor systemChain, Set 
unshareableResources, Set applicationManagedSecurityResources, EnterpriseBean 
instance, EJBProxyFactory proxyFactory, BasicTimerService timerService) {
           this.unshareableResources = unshareableResources;
           this.applicationManagedSecurityResources = 
applicationManagedSecurityResources;
           this.instance = instance;
           this.proxyFactory = proxyFactory;
           this.systemChain = systemChain;
  -        ejbActivateInvocation = 
systemMethodIndices.getEjbActivateInvocation(this);
  -        ejbPassivateInvocation = 
systemMethodIndices.getEjbPassivateInvocation(this);
           this.timerService = new TimerServiceImpl(timerService, this);
       }
   
  @@ -106,14 +102,6 @@
   
       public EJBProxyFactory getProxyFactory() {
           return proxyFactory;
  -    }
  -
  -    public void ejbActivate() throws Throwable {
  -        systemChain.invoke(ejbActivateInvocation);
  -    }
  -
  -    public void ejbPassivate() throws Throwable {
  -        systemChain.invoke(ejbPassivateInvocation);
       }
   
       public void setContext() throws Throwable {