From d5fa8715208da474e07da85514b10c70a38f46d0 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Mon, 28 Aug 2006 19:53:35 +0000
Subject: [PATCH] <zip filesonly="true"> included empty directories.  Bugzilla
 report 40258.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@437804 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                              |  2 ++
 src/etc/testcases/taskdefs/zip.xml                    | 11 +++++++++++
 src/main/org/apache/tools/ant/taskdefs/Zip.java       | 10 ++++++----
 .../org/apache/tools/ant/taskdefs/ZipTest.java        |  4 ++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 469cdac24..d7044423d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -273,6 +273,8 @@ Fixed bugs:
 * mixing of add and addConfigured methods in Mapper/ChainedMapper
   causes incorrect chaining. Bugzilla report 40228.
 
+* <zip filesonly="true"> included empty directories.  Bugzilla report 40258.
+
 Other changes:
 --------------
 
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index 9e8dbdf37..4ae3459f1 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -157,6 +157,17 @@
     </fail>
   </target>
 
+  <!-- Bugzilla Report 40258 -->
+  <target name="zipEmptyDirFilesOnly">
+    <mkdir dir="empty/empty2" />
+    <zip destfile="test3.zip" basedir="empty" update="true" filesonly="true" />
+    <fail message="archive should get skipped">
+      <condition>
+        <available file="test3.zip" />
+      </condition>
+    </fail>
+  </target>
+
   <target name="zipEmptyCreate">
     <mkdir dir="empty"/>
     <zip destfile="test3.zip" basedir="empty" whenempty="create" includes="*.xyz"/>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 5872b9729..a252a5851 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -1269,10 +1269,12 @@ public class Zip extends MatchingTask {
                 ((ZipScanner) rs).setEncoding(encoding);
             }
             Vector resources = new Vector();
-            String[] directories = rs.getIncludedDirectories();
-            for (int j = 0; j < directories.length; j++) {
-                if (!"".equals(directories[j]) || !skipEmptyNames) {
-                    resources.addElement(rs.getResource(directories[j]));
+            if (!doFilesonly) {
+                String[] directories = rs.getIncludedDirectories();
+                for (int j = 0; j < directories.length; j++) {
+                    if (!"".equals(directories[j]) || !skipEmptyNames) {
+                        resources.addElement(rs.getResource(directories[j]));
+                    }
                 }
             }
             String[] files = rs.getIncludedFiles();
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
index 80100d16f..c751ab100 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -137,6 +137,10 @@ public class ZipTest extends BuildFileTest {
     public void testZipEmptyDir() {
         executeTarget("zipEmptyDir");
     }
+    // Bugzilla Report 40258
+    public void testZipEmptyDirFilesOnly() {
+        executeTarget("zipEmptyDirFilesOnly");
+    }
     public void testZipEmptyCreate() {
         expectLogContaining("zipEmptyCreate", "Note: creating empty");
     }