svn commit: r1555356 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java

[bodewig]

Author: bodewig
Date: Sat Jan  4 15:31:05 2014
New Revision: 1555356

URL: http://svn.apache.org/r1555356
Log:
add a null-guard PR 53754

Modified:
    ant/core/trunk/WHATSNEW
    
ant/core/trunk/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1555356&r1=1555355&r2=1555356&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Jan  4 15:31:05 2014
@@ -61,6 +61,9 @@ Fixed bugs:
    manifest or manifest attribute.
    Bugzilla Report 54171
 
+ * reading of compiler args has become more defensive
+   Bugzilla Report 53754
+
 Other changes:
 --------------
 

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java?rev=1555356&r1=1555355&r2=1555356&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java 
(original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java 
Sat Jan  4 15:31:05 2014
@@ -131,8 +131,10 @@ public class FacadeTaskHelper {
             ImplementationSpecificArgument arg =
                 ((ImplementationSpecificArgument) e.next());
             String[] curr = arg.getParts(getImplementation());
-            for (int i = 0; i < curr.length; i++) {
-                tmp.add(curr[i]);
+            if (curr != null) {
+                for (int i = 0; i < curr.length; i++) {
+                    tmp.add(curr[i]);
+                }
             }
         }
         String[] res = new String[tmp.size()];