bodewig 2003/05/02 07:50:10
Modified: src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Improve fix for PR: 19449.
Don't drop directory entries after we've found out they were outdated,
but simply do not perform timestamp checks on the at all.
Revision Changes Path
1.106 +7 -5 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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- Zip.java 2 May 2003 14:44:53 -0000 1.105
+++ Zip.java 2 May 2003 14:50:10 -0000 1.106
@@ -807,15 +807,17 @@
myMapper = gm;
}
}
+
+ Resource[] resources = initialResources[i];
+ if (doFilesonly) {
+ resources = selectFileResources(resources);
+ }
+
newerResources[i] =
ResourceUtils.selectOutOfDateSources(this,
- initialResources[i],
+ resources,
myMapper,
getZipScanner());
- if (doFilesonly) {
- newerResources[i] = selectFileResources(newerResources[i]);
- }
-
needsUpdate = needsUpdate || (newerResources[i].length > 0);
if (needsUpdate && !doUpdate) {
