cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl RepositorySourceFactory.java RepositorySource.java

[unico]

unico       2004/02/13 05:43:31

  Modified:    
src/blocks/repository/java/org/apache/cocoon/components/source/impl
                        RepositorySourceFactory.java RepositorySource.java
  Log:
  release in factory instead of source
  
  Revision  Changes    Path
  1.2       +3 -1      
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java
  
  Index: RepositorySourceFactory.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RepositorySourceFactory.java      28 Oct 2003 15:03:59 -0000      1.1
  +++ RepositorySourceFactory.java      13 Feb 2004 13:43:31 -0000      1.2
  @@ -118,7 +118,9 @@
       }
       
       public void release(final Source source) {
  -        ((RepositorySource) source).recycle();
  +        if (source instanceof RepositorySource) {
  +            m_resolver.release(((RepositorySource) source).m_delegate);
  +        }
       }
   
   }
  
  
  
  1.3       +3 -10     
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySource.java
  
  Index: RepositorySource.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RepositorySource.java     3 Nov 2003 08:40:15 -0000       1.2
  +++ RepositorySource.java     13 Feb 2004 13:43:31 -0000      1.3
  @@ -58,7 +58,6 @@
   import java.util.Iterator;
   import java.util.List;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.ServiceException;
  @@ -90,10 +89,10 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Unico Hommes</a>
    */
   public class RepositorySource extends AbstractLogEnabled 
  -implements Source, ModifiableTraversableSource, InspectableSource, 
Recyclable {
  +implements Source, ModifiableTraversableSource, InspectableSource {
       
       // the wrapped source
  -    private final ModifiableTraversableSource m_delegate;
  +    final ModifiableTraversableSource m_delegate;
       private final ServiceManager m_manager;
       private final SourceDescriptor m_descriptor;
       
  @@ -114,13 +113,7 @@
               throw new SourceException("Missing service",e);
           }
       }
  -    
  -    public void recycle() {
  -        if (m_delegate instanceof Recyclable) {
  -            ((Recyclable) m_delegate).recycle();
  -        }
  -    }
  -    
  +        
       // ---------------------------------------------------- 
InspectableSource implementation
       
       /**