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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
