From 08413ada31e6a9e9dbed3073158d17123d5028e0 Mon Sep 17 00:00:00 2001
From: Jan Materne <jhm@apache.org>
Date: Mon, 21 May 2007 08:21:02 +0000
Subject: [PATCH] Fix Bug 42397: NPE in <path><files refid>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@540055 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/types/resources/Files.java      |  6 +++--
 src/tests/antunit/types/path-test.xml         | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/antunit/types/path-test.xml

diff --git a/src/main/org/apache/tools/ant/types/resources/Files.java b/src/main/org/apache/tools/ant/types/resources/Files.java
index 810a259fc..394f5debd 100644
--- a/src/main/org/apache/tools/ant/types/resources/Files.java
+++ b/src/main/org/apache/tools/ant/types/resources/Files.java
@@ -497,8 +497,10 @@ public class Files extends AbstractSelectorContainer
     }
 
     private boolean hasPatterns(PatternSet ps) {
-        return ps.getIncludePatterns(getProject()).length > 0
-            || ps.getExcludePatterns(getProject()).length > 0;
+        String[] includePatterns = ps.getIncludePatterns(getProject());
+        String[] excludePatterns = ps.getExcludePatterns(getProject());
+        return (includePatterns != null && includePatterns.length > 0)
+            || (includePatterns != null && excludePatterns.length > 0);
     }
 
 }
diff --git a/src/tests/antunit/types/path-test.xml b/src/tests/antunit/types/path-test.xml
new file mode 100644
index 000000000..3107f0384
--- /dev/null
+++ b/src/tests/antunit/types/path-test.xml
@@ -0,0 +1,25 @@
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../antunit-base.xml" />
+
+  <property name="existingFile" value="${basedir}/build.xml" />
+
+  <files id="files">
+    <include name="${existingFile}" />
+  </files>
+    
+  <target name="test-directUse" description="Bug 42397 - works fine">
+    <path id="path">
+      <files>
+        <include name="${existingFile}" />
+      </files>
+    </path>
+  </target>
+
+  <target name="test-refid" description="Bug 42397">
+    <path id="path">
+      <files refid="files" />
+    </path>
+  </target>
+
+</project>