You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/12/07 13:21:13 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 00/12/07 04:21:13
Modified: src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Allow for zip files that contain nothing but empty directories.
Revision Changes Path
1.20 +5 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Zip.java 2000/12/07 12:00:55 1.19
+++ Zip.java 2000/12/07 12:21:12 1.20
@@ -336,7 +336,11 @@
protected static String[][] grabFileNames(FileScanner[] scanners) {
String[][] result = new String[scanners.length][];
for (int i=0; i<scanners.length; i++) {
- result[i] = scanners[i].getIncludedFiles();
+ String[] files = scanners[i].getIncludedFiles();
+ String[] dirs = scanners[i].getIncludedDirectories();
+ result[i] = new String[files.length + dirs.length];
+ System.arraycopy(files, 0, result[i], 0, files.length);
+ System.arraycopy(dirs, 0, result[i], files.length, dirs.length);
}
return result;
}