You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by mp...@apache.org on 2006/03/21 17:06:58 UTC
svn commit: r387558 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Author: mpfingsthorn
Date: Tue Mar 21 08:06:56 2006
New Revision: 387558
URL: http://svn.apache.org/viewcvs?rev=387558&view=rev
Log:
Patch to make sure error handling _replaces_ the pipeline result already in the buffer.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java?rev=387558&r1=387557&r2=387558&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java Tue Mar 21 08:06:56 2006
@@ -111,29 +111,25 @@
this.contentHandler.startDocument();
startElem(this.rootElement);
- try {
- for (int i = 0; i < this.parts.size(); i++) {
- final Part part = (Part) this.parts.get(i);
- this.rootElementIndex = part.stripRootElement ? -1 : 0;
- if (part.element != null) {
- this.currentElement = part.element;
- startElem(part.element);
- } else {
- this.currentElement = this.rootElement;
- }
+ for (int i = 0; i < this.parts.size(); i++) {
+ final Part part = (Part) this.parts.get(i);
+ this.rootElementIndex = part.stripRootElement ? -1 : 0;
+ if (part.element != null) {
+ this.currentElement = part.element;
+ startElem(part.element);
+ } else {
+ this.currentElement = this.rootElement;
+ }
- try {
- SourceUtil.parse(this.manager, part.source, this);
- } finally {
- if (part.element != null) {
- endElem(part.element);
- }
- }
+ SourceUtil.parse(this.manager, part.source, this);
+
+ if (part.element != null ) {
+ endElem(part.element);
}
- } finally {
- endElem(this.rootElement);
- this.contentHandler.endDocument();
}
+
+ endElem(this.rootElement);
+ this.contentHandler.endDocument();
getLogger().debug("Finished aggregating content");
}