Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 84487 invoked from network); 10 May 2005 07:37:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 May 2005 07:37:58 -0000 Received: (qmail 56112 invoked by uid 500); 10 May 2005 07:40:59 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 56046 invoked by uid 500); 10 May 2005 07:40:58 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 55938 invoked by uid 500); 10 May 2005 07:40:57 -0000 Received: (qmail 55912 invoked by uid 99); 10 May 2005 07:40:57 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 10 May 2005 00:40:56 -0700 Received: (qmail 84227 invoked by uid 1146); 10 May 2005 07:37:29 -0000 Date: 10 May 2005 07:37:29 -0000 Message-ID: <20050510073729.84226.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N bodewig 2005/05/10 00:37:29 Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH DirectoryScanner.java Log: merge Revision Changes Path No revision No revision 1.64.2.12 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v retrieving revision 1.64.2.11 retrieving revision 1.64.2.12 diff -u -r1.64.2.11 -r1.64.2.12 --- DirectoryScanner.java 3 May 2005 18:26:35 -0000 1.64.2.11 +++ DirectoryScanner.java 10 May 2005 07:37:29 -0000 1.64.2.12 @@ -872,7 +872,7 @@ } if ((myfile == null || !myfile.exists()) && !isCaseSensitive()) { File f = findFile(basedir, currentelement, false); - if (f.exists()) { + if (f != null && f.exists()) { // adapt currentelement to the case we've // actually found currentelement = FILE_UTILS.removeLeadingPath(basedir, --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org