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

[djencks]

djencks     2005/02/04 21:36:23

  Modified:    modules/core/src/java/org/openejb/entity
                        EntityInstanceContext.java
  Log:

  Don't try to construct invalid EJBInvocations, or expect an AssertionError if 
you do.
  
  Revision  Changes    Path
  1.9       +14 -2     
openejb/modules/core/src/java/org/openejb/entity/EntityInstanceContext.java
  
  Index: EntityInstanceContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/EntityInstanceContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EntityInstanceContext.java        5 Oct 2004 07:04:00 -0000       1.8
  +++ EntityInstanceContext.java        5 Feb 2005 02:36:23 -0000       1.9
  @@ -71,14 +71,18 @@
       private final Object containerId;
       private final EntityContextImpl entityContext;
       private Object id;
  +    private final EJBInvocation ejbActivateInvocation;
  +    private final EJBInvocation ejbPassivateInvocation;
       private final EJBInvocation loadInvocation;
       private final EJBInvocation storeInvocation;
       private boolean stateValid;
   
       public EntityInstanceContext(Object containerId, EJBProxyFactory 
proxyFactory, EnterpriseBean instance, Interceptor lifecycleInterceptorChain, 
SystemMethodIndices systemMethodIndices, Set unshareableResources, Set 
applicationManagedSecurityResources, TransactionContextManager 
transactionContextManager, BasicTimerService timerService) {
  -        super(systemMethodIndices, lifecycleInterceptorChain, 
unshareableResources, applicationManagedSecurityResources, instance, 
proxyFactory, timerService);
  +        super(lifecycleInterceptorChain, unshareableResources, 
applicationManagedSecurityResources, instance, proxyFactory, timerService);
           this.containerId = containerId;
           entityContext = new EntityContextImpl(this, 
transactionContextManager);
  +        ejbActivateInvocation = 
systemMethodIndices.getEjbActivateInvocation(this);
  +        ejbPassivateInvocation = 
systemMethodIndices.getEjbPassivateInvocation(this);
           loadInvocation = systemMethodIndices.getEjbLoadInvocation(this);
           storeInvocation = systemMethodIndices.getEjbStoreInvocation(this);
           setContextInvocation = 
systemMethodIndices.getSetContextInvocation(this, entityContext);
  @@ -116,6 +120,14 @@
   
       public void setStateValid(boolean stateValid) {
           this.stateValid = stateValid;
  +    }
  +
  +    public void ejbActivate() throws Throwable {
  +        systemChain.invoke(ejbActivateInvocation);
  +    }
  +
  +    public void ejbPassivate() throws Throwable {
  +        systemChain.invoke(ejbPassivateInvocation);
       }
   
       public void associate() throws Throwable {