cvs commit: cocoon-2.2/src/java/org/apache/cocoon/transformation CIncludeTransformer.java AbstractExtractionTransformer.java

[cziegeler]

cziegeler    2003/10/23 00:57:24

  Modified:    src/java/org/apache/cocoon/transformation
                        CIncludeTransformer.java
                        AbstractExtractionTransformer.java
  Log:
  Moving to resettable
  
  Revision  Changes    Path
  1.9       +3 -3      
cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
  
  Index: CIncludeTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CIncludeTransformer.java  21 Oct 2003 12:45:12 -0000      1.8
  +++ CIncludeTransformer.java  23 Oct 2003 07:57:24 -0000      1.9
  @@ -253,7 +253,7 @@
       /**
        * Recycle the component
        */
  -    public void recycle() {
  +    public void reset() {
           if ( null != this.cachingSession ) {
               this.cacheManager.terminateSession( this.cachingSession );
           }
  @@ -262,7 +262,7 @@
               this.manager.release( this.recorder );
               this.recorder = null;
           }
  -        super.recycle();
  +        super.reset();
           this.configurationParameters = null;
           this.resourceParameters = null;
           if (this.getLogger().isErrorEnabled()) {
  
  
  
  1.2       +3 -2      
cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
  
  Index: AbstractExtractionTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractExtractionTransformer.java        9 Mar 2003 00:09:39 -0000       
1.1
  +++ AbstractExtractionTransformer.java        23 Oct 2003 07:57:24 -0000      
1.2
  @@ -90,7 +90,8 @@
           prefixMap = new HashMap();
       }
   
  -    public void recycle() {
  +    public void reset() {
  +        super.reset();
           this.extractLevel = 0;
           this.currentBuilder = null;
           this.prefixMap = null;