From 970247d771daf4acd9034dbfe996ad546f14c41a Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Wed, 28 Jan 2009 01:17:16 +0000 Subject: [PATCH] #45902: (without dofilesonly="true") sometimes recreated archives unnecessarily. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@738330 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/taskdefs/Zip.java | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index af0009e6e..3da2eaaba 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -132,6 +132,8 @@ Changes that could break older environments: Fixed bugs: ----------- + * would sometimes recreate JARs unnecessarily. Bugzilla report 45902. + * task couldn't overwrite existing symlinks that pointed to nonexistent files Bugzilla report 38199. diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index ae4952910..8f1d0c382 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1238,9 +1238,7 @@ public class Zip extends MatchingTask { } Resource[] resources = initialResources[i]; - if (doFilesonly) { - resources = selectFileResources(resources); - } + resources = selectFileResources(resources); newerResources[i] = ResourceUtils.selectOutOfDateSources(this, @@ -1331,9 +1329,7 @@ public class Zip extends MatchingTask { } Resource[] rs = initialResources[i]; - if (doFilesonly) { - rs = selectFileResources(rs); - } + rs = selectFileResources(rs); newerResources[i] = ResourceUtils.selectOutOfDateSources(this,