ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r572303 - in /ant/core/branches/ANT_17_BRANCH: WHATSNEW src/main/org/apache/tools/ant/util/FileUtils.java
Date Mon, 03 Sep 2007 12:58:08 GMT
Author: peterreilly
Date: Mon Sep  3 05:58:08 2007
New Revision: 572303

URL: http://svn.apache.org/viewvc?rev=572303&view=rev
Log:
sync

Modified:
    ant/core/branches/ANT_17_BRANCH/WHATSNEW
    ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/FileUtils.java

Modified: ant/core/branches/ANT_17_BRANCH/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/WHATSNEW?rev=572303&r1=572302&r2=572303&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/WHATSNEW (original)
+++ ant/core/branches/ANT_17_BRANCH/WHATSNEW Mon Sep  3 05:58:08 2007
@@ -114,6 +114,9 @@
 * 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

Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/FileUtils.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/FileUtils.java?rev=572303&r1=572302&r2=572303&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/FileUtils.java Mon
Sep  3 05:58:08 2007
@@ -930,7 +930,7 @@
                 textBuffer.append(new String(buffer, 0, bufferLength));
             }
         }
-        return (textBuffer == null) ? null : textBuffer.toString();
+        return (textBuffer == null) ? "" : textBuffer.toString();
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message