Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 15424 invoked from network); 17 Jul 2010 16:45:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Jul 2010 16:45:15 -0000 Received: (qmail 9624 invoked by uid 500); 17 Jul 2010 16:45:15 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 9545 invoked by uid 500); 17 Jul 2010 16:45:15 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 9538 invoked by uid 99); 17 Jul 2010 16:45:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jul 2010 16:45:15 +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; Sat, 17 Jul 2010 16:45:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 46D7523889E1; Sat, 17 Jul 2010 16:44:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r965106 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java Date: Sat, 17 Jul 2010 16:44:19 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100717164419.46D7523889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Sat Jul 17 16:44:18 2010 New Revision: 965106 URL: http://svn.apache.org/viewvc?rev=965106&view=rev Log: [MASSEMBLY-490] Assembly fails with 'Too many files' error when converting line endings. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java?rev=965106&r1=965105&r2=965106&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java Sat Jul 17 16:44:18 2010 @@ -24,6 +24,7 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.shared.filtering.MavenFilteringException; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.IOUtil; import java.io.File; import java.io.FileNotFoundException; @@ -97,9 +98,10 @@ public class FileFormatter private File formatLineEndings( String lineEndingChars, File source, File tempRoot ) throws AssemblyFormattingException { + Reader contentReader = null; try { - Reader contentReader = new FileReader( source ); + contentReader = new FileReader( source ); File target = FileUtils.createTempFile( source.getName() + ".", ".formatted", tempRoot ); @@ -115,5 +117,9 @@ public class FileFormatter { throw new AssemblyFormattingException( "Error line formatting file '" + source + "': " + e.getMessage(), e ); } + finally + { + IOUtil.close( contentReader ); + } } }