[webbeans-commits] Webbeans SVN: r529 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-12-15 07:43:39 -0500 (Mon, 15 Dec 2008)
New Revision: 529

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
Log:
Move destroy() to concrete bean classes

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -327,19 +327,6 @@
    }
 
    /**
-    * Destroys a bean instance
-    * 
-    * @param instance The instance to destroy
-    * 
-    * @see javax.webbeans.manager.Bean#destroy(Object)
-    */
-   @Override
-   public void destroy(T instance)
-   {
-      // TODO Auto-generated method stub
-   }
-
-   /**
     * Binds the decorators to the proxy
     */
    protected void bindDecorators()
@@ -579,4 +566,5 @@
       buffer.append(mergedStereotypes.toString() + "\n");
       return buffer.toString();
    }
+   
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -38,6 +38,8 @@
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.util.Names;
 
 /**
@@ -49,6 +51,8 @@
  */
 public class EnterpriseBean<T> extends AbstractClassBean<T>
 {
+   
+   private LogProvider log = Logging.getLogProvider(EnterpriseBean.class);
 
    private EjbMetaData<T> ejbMetaData;
 
@@ -225,14 +229,21 @@
    }
 
    /**
-    * Destroys an instance of a bean
+    * Destroys an instance of the bean
     * 
     * @param instance The instance
     */
    @Override
    public void destroy(T instance)
    {
-      super.destroy(instance);
+      try
+      {
+         getRemoveMethod().invoke(instance);
+      }
+      catch (Exception e) 
+      {
+         log.error("Error destroying " + toString(), e);
+      }
    }
 
    /**

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -58,6 +58,12 @@
       return new EventImpl<T>(getTypeParameter(), manager, getBindingTypesArray());
    }
    
+   @Override
+   public void destroy(Event<T> instance)
+   {
+      // TODO Implement any EventBean destruction needed
+   }
+   
    /**
     * Returns a string representation
     * 

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -56,5 +56,11 @@
    {
       return new InstanceImpl<T>(getTypeParameter(), manager, getBindingTypesArray());
    }
+   
+   @Override
+   public void destroy(Instance<T> instance)
+   {
+      // TODO Implement any cleanup needed
+   }
 
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -74,6 +74,12 @@
       checkReturnValue(instance);
       return instance;
    }
+   
+   @Override
+   public void destroy(T instance)
+   {
+      // TODO Implement any cleanup needed
+   }
 
    /**
     * Gets the annotated item representing the field

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -82,6 +82,12 @@
       checkReturnValue(instance);
       return instance;
    }
+   
+   @Override
+   public void destroy(T instance)
+   {
+      // TODO Implement any cleanup needed
+   }
 
    /**
     * Initializes the bean and its metadata

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2008-12-15 12:35:50 UTC (rev 528)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2008-12-15 12:43:39 UTC (rev 529)
@@ -95,7 +95,14 @@
    @Override
    public void destroy(T instance)
    {
-      callPreDestroy(instance);
+      try
+      {
+         callPreDestroy(instance);
+      }
+      catch (Exception e) 
+      {
+         log.error("Error destroying " + toString(), e);
+      }
    }
 
    /**