cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giac...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/sitemap ContentAggregator.java
Date Tue, 19 Jun 2001 21:32:03 GMT
giacomo     01/06/19 14:32:02

  Modified:    src/org/apache/cocoon/sitemap ContentAggregator.java
  Log:
  Fixed ContentAggregator issue with patch from Vadim Gritsenko.
  It seems this patch hasn't made it into the 2.1 branch so far.
  
  Revision  Changes    Path
  1.7       +7 -2      xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ContentAggregator.java	2001/06/08 20:28:24	1.6
  +++ ContentAggregator.java	2001/06/19 21:32:01	1.7
  @@ -42,7 +42,7 @@
   
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version CVS $Id: ContentAggregator.java,v 1.6 2001/06/08 20:28:24 giacomo Exp $
  + * @version CVS $Id: ContentAggregator.java,v 1.7 2001/06/19 21:32:01 giacomo Exp $
    */
   public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable,
Composable {
       /** the current sitemap */
  @@ -162,7 +162,6 @@
                       getLogger().error("ContentAggregator: cannot process event pipeline
for URI " + part.uri, e);
                       throw new ProcessingException("ContentAggregator: cannot process event
pipeline for URI " + part.uri, e);
                   } finally {
  -                    this.manager.release(ep);
                       this.environment.popURI();
                       if (!part.element.equals("")) {
                           this.endElem(prefix, part.element);
  @@ -338,7 +337,13 @@
           this.rootElementNSPrefix = null;
           this.parts.clear();
           this.environment = null;
  +
  +        for (int i = 0; i < this.partEventPipelines.size(); i++) {
  +            Component component = (Component)this.partEventPipelines.get(i);
  +            this.manager.release(component);
  +        }
           this.partEventPipelines.clear();
  +
           this.currentNS.clear();
           this.xmlConsumer = null;
           this.contentHandler = null;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message