Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 32667 invoked from network); 19 Nov 2010 15:48:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Nov 2010 15:48:31 -0000 Received: (qmail 71044 invoked by uid 500); 19 Nov 2010 15:49:03 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 70971 invoked by uid 500); 19 Nov 2010 15:49:03 -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 70959 invoked by uid 99); 19 Nov 2010 15:49:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Nov 2010 15:49:02 +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; Fri, 19 Nov 2010 15:49:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6DC8423889EB; Fri, 19 Nov 2010 15:47:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1036906 - /ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Date: Fri, 19 Nov 2010 15:47:48 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101119154748.6DC8423889EB@eris.apache.org> Author: bodewig Date: Fri Nov 19 15:47:48 2010 New Revision: 1036906 URL: http://svn.apache.org/viewvc?rev=1036906&view=rev Log: restrict impact of fix for PR 50295 on 'good' VMs to an additional syscall for empty directories rather than an additional call for every directory Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=1036906&r1=1036905&r2=1036906&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Fri Nov 19 15:47:48 2010 @@ -1248,7 +1248,7 @@ public class DirectoryScanner TokenizedPath newPath = new TokenizedPath(path, newfiles[i]); File file = new File(dir, newfiles[i]); String[] children = file.list(); - if (children == null || file.isFile()) { + if (children == null || (children.length == 0 && file.isFile())) { if (isIncluded(newPath)) { accountForIncludedFile(newPath, file); } else {