Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 27441 invoked from network); 12 Jan 2010 05:25:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jan 2010 05:25:59 -0000 Received: (qmail 98128 invoked by uid 500); 12 Jan 2010 05:25:59 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 98057 invoked by uid 500); 12 Jan 2010 05:25:58 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 98048 invoked by uid 99); 12 Jan 2010 05:25:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2010 05:25:58 +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; Tue, 12 Jan 2010 05:25:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7B7B323889DD; Tue, 12 Jan 2010 05:25:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r898183 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Date: Tue, 12 Jan 2010 05:25:35 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100112052535.7B7B323889DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Tue Jan 12 05:25:34 2010 New Revision: 898183 URL: http://svn.apache.org/viewvc?rev=898183&view=rev Log: try to delete temporary files in fixcrlf. PR 48506. Modified: ant/core/trunk/WHATSNEW ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=898183&r1=898182&r2=898183&view=diff ============================================================================== --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Tue Jan 12 05:25:34 2010 @@ -9,6 +9,9 @@ Fixed bugs: ----------- + * now tries earlier to delete the created temporary files. + Bugzilla Report 48506. + Other changes: -------------- Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java?rev=898183&r1=898182&r2=898183&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Tue Jan 12 05:25:34 2010 @@ -376,10 +376,13 @@ Project.MSG_DEBUG); FILE_UTILS.setFileLastModified(destFile, lastModified); } - tmpFile = null; } } catch (IOException e) { throw new BuildException("error running fixcrlf on file " + srcFile, e); + } finally { + if (tmpFile != null && tmpFile.exists()) { + FILE_UTILS.tryHardToDelete(tmpFile); + } } }