Return-Path: Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: (qmail 23158 invoked from network); 5 Jan 2011 09:42:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Jan 2011 09:42:53 -0000 Received: (qmail 31648 invoked by uid 500); 5 Jan 2011 09:42:53 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 31609 invoked by uid 500); 5 Jan 2011 09:42:53 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 31602 invoked by uid 99); 5 Jan 2011 09:42:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jan 2011 09:42:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 05 Jan 2011 09:42:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75CE52388A38; Wed, 5 Jan 2011 09:42:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1055380 - /poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java Date: Wed, 05 Jan 2011 09:42:30 -0000 To: commits@poi.apache.org From: nick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110105094230.75CE52388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nick Date: Wed Jan 5 09:42:30 2011 New Revision: 1055380 URL: http://svn.apache.org/viewvc?rev=1055380&view=rev Log: Sync with trunk for NPOIFS Modified: poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java Modified: poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java URL: http://svn.apache.org/viewvc/poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java?rev=1055380&r1=1055379&r2=1055380&view=diff ============================================================================== --- poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java (original) +++ poi/branches/NIO_32_BRANCH/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java Wed Jan 5 09:42:30 2011 @@ -183,6 +183,14 @@ public class NPOIFSFileSystem extends Bl channel.close(); } throw e; + } catch(RuntimeException e) { + // Comes from Iterators etc. + // TODO Decide if we can handle these better whilst + // still sticking to the iterator contract + if(closeChannelOnError) { + channel.close(); + } + throw e; } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org