svn commit: rev 55971 - in cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor: . sitemap

[cziegeler]

Author: cziegeler
Date: Fri Oct 29 07:20:55 2004
New Revision: 55971

Modified:
   
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
   
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
   
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
   
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
Log:
Set redirectory during handle errors
Remove some unused imports

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
 (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
 Fri Oct 29 07:20:55 2004
@@ -58,8 +58,6 @@
     /** The component info needed to build child processors */
     private ProcessorComponentInfo componentInfo;
 
-    private Map sitemapComponentConfigurations;
-
     private Configuration componentConfigurations;
 
     /** Number of simultaneous uses of this processor (either by concurrent 
request or by internal requests) */
@@ -144,7 +142,6 @@
        /** Set the sitemap component configurations (called as part of the 
tree building process) */
     public void setComponentConfigurations(Configuration 
componentConfigurations) {
         this.componentConfigurations = componentConfigurations;
-        this.sitemapComponentConfigurations = null;
     }
 
     public Configuration[] getComponentConfigurations() {

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
    (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
    Fri Oct 29 07:20:55 2004
@@ -33,7 +33,7 @@
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">J&uuml;rgen Seitz</a>
  * @author <a href="mailto:[EMAIL PROTECTED]">Bj&ouml;rn L&uuml;tkemeier</a>
- * @version CVS $Id: ErrorHandlerHelper.java,v 1.6 2004/07/15 12:49:50 sylvain 
Exp $
+ * @version CVS $Id$
  */
 public class ErrorHandlerHelper extends AbstractLogEnabled implements 
Serviceable {
 
@@ -46,7 +46,7 @@
         this.manager = manager;
     }
 
-    public boolean invokeErrorHandler(ProcessingNode node, Exception ex, 
Environment env)
+    public boolean invokeErrorHandler(ProcessingNode node, Exception ex, 
Environment env, InvokeContext originalContext)
     throws Exception {
                Map objectModel = env.getObjectModel();
        
@@ -81,6 +81,7 @@
                        errorContext = new InvokeContext();
                        errorContext.enableLogging(getLogger());
                        errorContext.service(this.manager);
+            errorContext.setRedirector(originalContext.getRedirector());
                        
                        nodeSuccessful = node.invoke(env, errorContext);
         } catch (Exception subEx) {
@@ -94,10 +95,9 @@
         }
         
         if (nodeSuccessful) {
-               return true;
-        } else {
-                       throw ex;
+            return true;
         }
+        throw ex;
     }
 }
 

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
  (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
  Fri Oct 29 07:20:55 2004
@@ -153,11 +153,11 @@
             } else if (error404 != null && ex instanceof 
ResourceNotFoundException) {
                 // Invoke 404-specific handler
                 handledErrorsLogger.error(ex.getMessage(), ex);
-                return errorHandlerHelper.invokeErrorHandler(error404, ex, 
env);
+                return errorHandlerHelper.invokeErrorHandler(error404, ex, 
env, context);
             } else if (error500 != null) {
                 // Invoke global handler
                 handledErrorsLogger.error(ex.getMessage(), ex);
-                return errorHandlerHelper.invokeErrorHandler(error500, ex, 
env);
+                return errorHandlerHelper.invokeErrorHandler(error500, ex, 
env, context);
             } else {
                 // No handler : propagate
                 throw ex;

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
 (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
 Fri Oct 29 07:20:55 2004
@@ -31,7 +31,7 @@
  * @author <a href="mailto:[EMAIL PROTECTED]">Bj&ouml;rn L&uuml;tkemeier</a>
  * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
  * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: PipelinesNode.java,v 1.14 2004/07/15 12:49:50 sylvain Exp 
$
+ * @version CVS $Id$
  */
 public final class PipelinesNode extends SimpleParentProcessingNode
                                  implements Serviceable, Disposable {
@@ -96,11 +96,10 @@
         } catch (Exception ex) {
             if (this.errorHandler != null) {
                 // Invoke pipelines handler
-                return 
this.errorHandlerHelper.invokeErrorHandler(this.errorHandler, ex, env);
-            } else {
-                // No handler : propagate
-                throw ex;
+                return 
this.errorHandlerHelper.invokeErrorHandler(this.errorHandler, ex, env, context);
             }
+            // No handler : propagate
+            throw ex;
         }
     }