From 6528412d219b05ca763dc198bd3e7d75754e57c5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 26 Feb 2003 09:57:01 +0000
Subject: [PATCH] Avoid NPE in <zip> and friends for empty <fileset>s.

Submitted by:	Nico Seessle <nico at apache dot org>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274176 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/jar.xml            | 21 +++++++++++++++++++
 .../org/apache/tools/ant/taskdefs/Zip.java    |  1 +
 .../apache/tools/ant/taskdefs/JarTest.java    |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 55fc0f5c3..9b94dea98 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -5,6 +5,8 @@
   <property name="tmp.jar" location="tmp.jar"/>
   <property name="tmp.dir" location="jartmp"/>
   <property name="tmp.zip" location="tmp.zip"/>
+  <property name="tmp1.dir" location="jartmp1"/>
+  <property name="tmp2.dir" location="jartmp2"/>
 
   <target name="test1">
     <jar/>
@@ -166,6 +168,25 @@
     <delete file="${tmp.jar}" />
     <delete dir="${tmp.dir}"/>
     <delete file="${tmp.zip}" />
+    <delete dir="${tmp1.dir}"/>
+    <delete dir="${tmp2.dir}"/>
+  </target>
+
+  <target name="testCreateWithEmptyFilesetSetUp">
+    <mkdir dir="${tmp1.dir}"/>
+    <mkdir dir="${tmp2.dir}"/>
+    <echo file="${tmp2.dir}/foo.txt" message="foo"/>
+  </target>
+
+  <target name="testCreateWithEmptyFileset">
+    <jar destfile="${tmp.jar}">
+      <fileset dir="${tmp1.dir}">
+        <include name="**/*.doesNotExist"/>
+      </fileset>
+      <fileset dir="${tmp2.dir}">
+        <include name="**/foo.txt"/>
+      </fileset>
+    </jar>
   </target>
 
 </project>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 3acf6aab0..4e696fa72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -750,6 +750,7 @@ public class Zip extends MatchingTask {
 
         for (int i = 0; i < filesets.length; i++) {
             if (initialResources[i].length == 0) {
+                newerResources[i] = new Resource[] {};
                 continue;
             }
             
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index 7ef7c56de..492146399 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -214,4 +214,9 @@ public class JarTest extends BuildFileTest {
                      "testRecreateZipfilesetWithUpdateNewerFile");
     }
 
+    public void testCreateWithEmptyFileset() {
+        executeTarget("testCreateWithEmptyFilesetSetUp");
+        executeTarget("testCreateWithEmptyFileset");
+        executeTarget("testCreateWithEmptyFileset");
+    }
 }