Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46956DF8E for ; Tue, 13 Nov 2012 08:35:12 +0000 (UTC) Received: (qmail 29101 invoked by uid 500); 13 Nov 2012 08:35:12 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 28966 invoked by uid 500); 13 Nov 2012 08:35:09 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 28922 invoked by uid 99); 13 Nov 2012 08:35:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 08:35:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 08:35:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 59DB823888CD; Tue, 13 Nov 2012 08:34:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408635 - /sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java Date: Tue, 13 Nov 2012 08:34:46 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121113083446.59DB823888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Nov 13 08:34:45 2012 New Revision: 1408635 URL: http://svn.apache.org/viewvc?rev=1408635&view=rev Log: SLING-2661 : Components might not be disposed if exception is occuring Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java?rev=1408635&r1=1408634&r2=1408635&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java Tue Nov 13 08:34:45 2012 @@ -182,11 +182,13 @@ public class PipelineImpl implements Pro */ public void finished(final boolean errorOccured) throws IOException { IOException ioe = null; - // if an error occured, we only clean up + // if an error occurred, we only clean up if ( !errorOccured ) { try { this.generator.finished(); - } catch (SAXException se) { + } catch (final IOException localIOE) { + ioe = localIOE; + } catch (final SAXException se) { if ( se.getCause() != null && se.getCause() instanceof IOException ) { ioe = (IOException)se.getCause(); } else { @@ -195,7 +197,7 @@ public class PipelineImpl implements Pro } } } - // now dispose component + // now dispose components if ( this.generator != null ) { this.generator.dispose(); } @@ -209,6 +211,7 @@ public class PipelineImpl implements Pro if ( this.serializer != null ) { this.serializer.dispose(); } + // throw exception if ( ioe != null ) { throw ioe; }