Author: bodewig
Date: Wed Jul 15 10:17:09 2009
New Revision: 794215

URL: http://svn.apache.org/viewvc?rev=794215&view=rev
Log:
don't ignore directory resources when performing up-to-date checks

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

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=794215&r1=794214&r2=794215&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 Jul 15 
10:17:09 2009
@@ -1354,8 +1354,9 @@
             }
 
             Resource[] resources = initialResources[i];
-            resources = selectFileResources(resources);
-
+            if (doFilesonly) {
+                resources = selectFileResources(resources);
+            }
             newerResources[i] =
                 ResourceUtils.selectOutOfDateSources(this,
                                                      resources,
@@ -1445,8 +1446,9 @@
             }
 
             Resource[] rs = initialResources[i];
-            rs = selectFileResources(rs);
-
+            if (doFilesonly) {
+                rs = selectFileResources(rs);
+            }
             newerResources[i] =
                 ResourceUtils.selectOutOfDateSources(this,
                                                      rs,


Reply via email to