Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 54012 invoked from network); 23 Dec 2007 05:45:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Dec 2007 05:45:20 -0000 Received: (qmail 72276 invoked by uid 500); 23 Dec 2007 05:45:09 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 72211 invoked by uid 500); 23 Dec 2007 05:45:09 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 72193 invoked by uid 99); 23 Dec 2007 05:45:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Dec 2007 21:45:09 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2007 05:45:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE79A1A983A; Sat, 22 Dec 2007 21:44:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r606540 - /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java Date: Sun, 23 Dec 2007 05:44:55 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071223054456.EE79A1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vgritsenko Date: Sat Dec 22 21:44:54 2007 New Revision: 606540 URL: http://svn.apache.org/viewvc?rev=606540&view=rev Log: simplify Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java?rev=606540&r1=606539&r2=606540&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java (original) +++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java Sat Dec 22 21:44:54 2007 @@ -488,24 +488,24 @@ */ protected void prepareInternalErrorHandler(Environment environment, ProcessingException ex) throws ProcessingException { - if (this.errorHandler != null) { - try { - this.errorPipeline = this.errorHandler.prepareErrorPipeline(ex); - if (this.errorPipeline != null) { - this.errorPipeline.prepareInternal(environment); - return; - } - } catch (ProcessingException e) { - // Log the original exception - getLogger().error("Failed to process error handler for exception", ex); - throw e; - } catch (Exception e) { - getLogger().error("Failed to process error handler for exception", ex); - throw new ProcessingException("Failed to handle exception <" + ex.getMessage() + ">", e); - } - } else { + if (this.errorHandler == null) { // propagate exception if we have no error handler throw ex; + } + + try { + this.errorPipeline = this.errorHandler.prepareErrorPipeline(ex); + if (this.errorPipeline != null) { + this.errorPipeline.prepareInternal(environment); + } + } catch (ProcessingException e) { + // Log the original exception + getLogger().error("Failed to process error handler for exception", ex); + throw e; + } catch (Exception e) { + // Log the original exception + getLogger().error("Failed to process error handler for exception", ex); + throw new ProcessingException("Failed to handle exception <" + ex.getMessage() + ">", e); } }