From 02305cfec195bf8cf1e92215f991720d86ff9174 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 2 May 2003 14:50:10 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274544 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Zip.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index a4c0df8cb..a6993fae4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -807,15 +807,17 @@ public class Zip extends MatchingTask { 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) {