bodewig 2004/06/07 05:29:09
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Zip.java
Log:
merge
Revision Changes Path
No revision
No revision
1.116.2.9 +12 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.116.2.8
retrieving revision 1.116.2.9
diff -u -r1.116.2.8 -r1.116.2.9
--- Zip.java 25 May 2004 11:48:35 -0000 1.116.2.8
+++ Zip.java 7 Jun 2004 12:29:09 -0000 1.116.2.9
@@ -903,6 +903,12 @@
protected Resource[][] grabResources(FileSet[] filesets) {
Resource[][] result = new Resource[filesets.length][];
for (int i = 0; i < filesets.length; i++) {
+ boolean skipEmptyNames = true;
+ if (filesets[i] instanceof ZipFileSet) {
+ ZipFileSet zfs = (ZipFileSet) filesets[i];
+ skipEmptyNames = zfs.getPrefix(getProject()).equals("")
+ && zfs.getFullpath(getProject()).equals("");
+ }
DirectoryScanner rs =
filesets[i].getDirectoryScanner(getProject());
if (rs instanceof ZipScanner) {
@@ -911,11 +917,15 @@
Vector resources = new Vector();
String[] directories = rs.getIncludedDirectories();
for (int j = 0; j < directories.length; j++) {
- resources.addElement(rs.getResource(directories[j]));
+ if (!"".equals(directories[0]) || !skipEmptyNames) {
+ resources.addElement(rs.getResource(directories[j]));
+ }
}
String[] files = rs.getIncludedFiles();
for (int j = 0; j < files.length; j++) {
- resources.addElement(rs.getResource(files[j]));
+ if (!"".equals(files[0]) || !skipEmptyNames) {
+ resources.addElement(rs.getResource(files[j]));
+ }
}
result[i] = new Resource[resources.size()];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
