cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r226270 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Date Thu, 28 Jul 2005 22:37:52 GMT
Author: vgritsenko
Date: Thu Jul 28 15:37:48 2005
New Revision: 226270

URL: http://svn.apache.org/viewcvs?rev=226270&view=rev
Log:
reset internal error handler in the ProcessingPipeline if <pipeline/> does not have
it

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java?rev=226270&r1=226269&r2=226270&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Thu Jul 28 15:37:48 2005
@@ -131,8 +131,12 @@
         context.inform(this.processingPipeline, this.parameters, env.getObjectModel());
         try {
             if (this.errorHandlerHelper.isInternal()) {
+                // Set internal error handler in the pipeline
                 context.getProcessingPipeline().setErrorHandler(
                         new SitemapErrorHandler(this.errorHandlerHelper, env, context));
+            } else {
+                // Reset internal error handler (previous pipeline might had set it) 
+                context.getProcessingPipeline().setErrorHandler(null);
             }
 
             if (invokeNodes(children, env, context)) {



Mime
View raw message