[jboss-cvs] JBossAS SVN: r78710 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: aop and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-09-19 08:45:00 -0400 (Fri, 19 Sep 2008)
New Revision: 78710

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/BeanContainerBeanContextFactory.java
Log:
EJBTHREE-1496: invoking pre-destroy callback

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-09-19 12:21:32 UTC (rev 78709)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-09-19 12:45:00 UTC (rev 78710)
@@ -315,6 +315,15 @@
       return JavaEEComponentHelper.createObjectName(deployment, unitName, ejbName);
    }
    
+   /**
+    * Do nothing.
+    * @param ctx
+    */
+   public void destroyBeanContext(org.jboss.ejb3.interceptors.container.BeanContext<?> ctx)
+   {
+      
+   }
+   
    // TODO: re-evaluate this exposure
    @Deprecated
    public Advisor getAdvisor()
@@ -1115,9 +1124,7 @@
 
    public void invokePreDestroy(BeanContext beanContext)
    {
-      // This is the correct way to destroy an instance, do
-      // not call invokeCallback here.
-      beanContainer.destroy(beanContext);
+      invokeCallback(beanContext, PreDestroy.class);
    }
 
    public void invokePostActivate(BeanContext beanContext)

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/BeanContainerBeanContextFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/BeanContainerBeanContextFactory.java	2008-09-19 12:21:32 UTC (rev 78709)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/BeanContainerBeanContextFactory.java	2008-09-19 12:45:00 UTC (rev 78710)
@@ -45,8 +45,7 @@
     */
    public void destroyBean(BeanContext<Object> bean)
    {
-      // TODO Auto-generated method stub
-
+      container.getEJBContainer().destroyBeanContext(bean);
    }
 
    public void setContainer(BeanContainer container)