You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jg...@apache.org on 2009/01/28 02:17:16 UTC

svn commit: r738330 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Zip.java

Author: jglick
Date: Wed Jan 28 01:17:16 2009
New Revision: 738330

URL: http://svn.apache.org/viewvc?rev=738330&view=rev
Log:
#45902: <zip> (without dofilesonly="true") sometimes recreated archives unnecessarily.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=738330&r1=738329&r2=738330&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Jan 28 01:17:16 2009
@@ -132,6 +132,8 @@
 Fixed bugs:
 -----------
 
+ * <zip> would sometimes recreate JARs unnecessarily. Bugzilla report 45902.
+
  * <symlink> task couldn't overwrite existing symlinks that pointed to nonexistent files
    Bugzilla report 38199.
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?rev=738330&r1=738329&r2=738330&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Wed Jan 28 01:17:16 2009
@@ -1238,9 +1238,7 @@
             }
 
             Resource[] resources = initialResources[i];
-            if (doFilesonly) {
-                resources = selectFileResources(resources);
-            }
+            resources = selectFileResources(resources);
 
             newerResources[i] =
                 ResourceUtils.selectOutOfDateSources(this,
@@ -1331,9 +1329,7 @@
             }
 
             Resource[] rs = initialResources[i];
-            if (doFilesonly) {
-                rs = selectFileResources(rs);
-            }
+            rs = selectFileResources(rs);
 
             newerResources[i] =
                 ResourceUtils.selectOutOfDateSources(this,