bloritsch 01/06/12 07:22:33
Modified: src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
ContentAggregator.java
Added: lib Tag: cocoon_20_branch avalon-excalibur.jar
avalon-framework.jar
Removed: lib Tag: cocoon_20_branch avalon-excalibur-4.0b3.jar
avalon-framework-4.0b3.jar
Log:
Update Avalon to unnofficial bug fixed update.
Also, fixed ContentAggregator issue with patch from
Vadim Gratsenko
Revision Changes Path
No revision
No revision
1.2.2.1 +303 -279 xml-cocoon2/lib/Attic/avalon-excalibur.jar
<<Binary file>>
1.2.2.1 +115 -105 xml-cocoon2/lib/Attic/avalon-framework.jar
<<Binary file>>
No revision
No revision
1.5.2.3 +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.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- ContentAggregator.java 2001/06/08 14:42:00 1.5.2.2
+++ ContentAggregator.java 2001/06/12 14:22:31 1.5.2.3
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ContentAggregator.java,v 1.5.2.2 2001/06/08 14:42:00 bloritsch
Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.5.2.3 2001/06/12 14:22:31 bloritsch
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,6 +337,12 @@
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;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
