From a9592b869e5648b3508ecd855bddf1dc182cb8f6 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Mon, 3 Sep 2007 12:57:52 +0000
Subject: [PATCH] Bugzilla 43292: filtermapper could throw an NPE. - change
 FileUtils to return an empty string rather than null for zero-length files

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@572302 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                          | 3 +++
 src/main/org/apache/tools/ant/util/FileUtils.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 93d3909c7..f5c34f134 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -154,6 +154,9 @@ Fixed bugs:
 * War task failed with "No WEB-INF/web.xml file was added" when called
   a second time. Bugzilla 43121.
 
+* FilterMapper could throw an NPE.
+  Bugzilla 43292.
+
 Other changes:
 --------------
 * <script> now has basic support for JavaFX scripts
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index dc3252cd3..95e463972 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -930,7 +930,7 @@ public class FileUtils {
                 textBuffer.append(new String(buffer, 0, bufferLength));
             }
         }
-        return (textBuffer == null) ? null : textBuffer.toString();
+        return (textBuffer == null) ? "" : textBuffer.toString();
     }
 
     /**