[jboss-cvs] jboss-seam/src/main/org/jboss/seam/contexts ...

[Gavin King]

  User: gavin   
  Date: 07/06/18 17:32:04

  Modified:    src/main/org/jboss/seam/contexts  Contexts.java
  Log:
  make @Destroy optional on default @Remove method
  
  Revision  Changes    Path
  1.50      +2 -9      jboss-seam/src/main/org/jboss/seam/contexts/Contexts.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Contexts.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Contexts.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- Contexts.java	11 Jun 2007 05:19:20 -0000	1.49
  +++ Contexts.java	18 Jun 2007 21:32:04 -0000	1.50
  @@ -16,7 +16,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.49 $
  + * @version $Revision: 1.50 $
    */
   public class Contexts 
   {
  @@ -227,14 +227,7 @@
                  if (object!=null) //in a portal environment, this is possible
                  {
                     if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preDestroy." + name);
  -                  try
  -                  {
  -                     component.callDestroyMethod(object);
  -                  }
  -                  catch (Exception e)
  -                  {
  -                     log.warn("Could not destroy component: " + name, e);
  -                  }
  +                  component.destroy(object);
                  }
               }
            }