cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelineNode.java

[sy...@apache.org]

sylvain     2003/04/07 01:21:30

  Modified:    src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        PipelineNode.java
  Log:
  Propagate exceptions in error notifiers, which avoids the "cocoon confusion" message when an error occurs in <map:handle-errors>
  
  Revision  Changes    Path
  1.3       +4 -3      cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
  
  Index: PipelineNode.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PipelineNode.java	1 Apr 2003 21:25:09 -0000	1.2
  +++ PipelineNode.java	7 Apr 2003 08:21:30 -0000	1.3
  @@ -217,8 +217,9 @@
               // <notifier> is added in HandleErrorsNode
               return node.invoke(env, errorContext);
           } catch (Exception subEx) {
  -            getLogger().error("Error notifier is unable to notify the problem. Please check the logs. In the default webapp, look in the WEB-INF/logs dir.", subEx);
  -            return false;
  +            getLogger().error("An exception occured in while handling errors at " + node.getLocation(), subEx);
  +            // Rethrow it : it will either be handled by the parent sitemap or by the environment (e.g. Cocoon servlet)
  +            throw subEx;
           } finally {
               if (errorContext != null) {
                   errorContext.dispose();