cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/pool/test ClassInstanceObjectFactory.java

[leif]

leif        02/02/02 07:04:26

  Modified:    src/scratchpad/org/apache/avalon/excalibur/pool/test
                        ClassInstanceObjectFactory.java
  Log:
  Added support for disposable objects
  
  Revision  Changes    Path
  1.3       +17 -4     
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/pool/test/ClassInstanceObjectFactory.java
  
  Index: ClassInstanceObjectFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/pool/test/ClassInstanceObjectFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassInstanceObjectFactory.java   25 Jan 2002 01:24:27 -0000      1.2
  +++ ClassInstanceObjectFactory.java   2 Feb 2002 15:04:26 -0000       1.3
  @@ -10,11 +10,12 @@
   import java.util.HashMap;
   
   import org.apache.avalon.excalibur.pool.ObjectFactory;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.logger.Logger;
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2002/01/25 01:24:27 $
  + * @version CVS $Revision: 1.3 $ $Date: 2002/02/02 15:04:26 $
    * @since 4.1
    */
   public class ClassInstanceObjectFactory
  @@ -47,7 +48,11 @@
           Integer id = new Integer( m_id++ );
           
           m_instances.put( object, id );
  -        m_logger.debug( "ClassInstanceObjectFactory.newInstance()  id:" + id 
);
  +        
  +        if (m_logger.isDebugEnabled())
  +        {
  +            m_logger.debug( "ClassInstanceObjectFactory.newInstance()  id:" 
+ id );
  +        }
           
           return object;
       }
  @@ -59,9 +64,17 @@
       
       public void decommission( Object object ) throws Exception
       {
  +        if ( object instanceof Disposable )
  +        {
  +            ((Disposable)object).dispose();
  +        }
           Integer id = (Integer)m_instances.remove( object );
  -        m_logger.debug( "ClassInstanceObjectFactory.decommission(a "
  -            + object.getClass().getName() + ")  id:" + id );
  +        
  +        if (m_logger.isDebugEnabled())
  +        {
  +            m_logger.debug( "ClassInstanceObjectFactory.decommission(a "
  +                + object.getClass().getName() + ")  id:" + id );
  +        }
       }
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>