mbenson 2005/02/11 10:48:24
Modified: src/main/org/apache/tools/ant/taskdefs Copy.java
Log:
File inclusion: unnecessarily checked presence of selectors
AND DirectoryScanner.isEverythingIncluded, which will be false if
selectors cause omissions.
Revision Changes Path
1.82 +3 -5 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Copy.java 11 Feb 2005 18:38:40 -0000 1.81
+++ Copy.java 11 Feb 2005 18:48:24 -0000 1.82
@@ -415,10 +415,8 @@
String[] srcFiles = ds.getIncludedFiles();
String[] srcDirs = ds.getIncludedDirectories();
- boolean isEverythingIncluded = ds.isEverythingIncluded()
- && (!fs.hasSelectors() && !fs.hasPatterns());
- if (isEverythingIncluded
- && !flatten && mapperElement == null) {
+ if (!flatten && mapperElement == null
+ && ds.isEverythingIncluded() && !fs.hasPatterns()) {
completeDirMap.put(fromDir, destDir);
}
scan(fromDir, destDir, srcFiles, srcDirs);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
