From a8bcf75d209a133860382489726d714a0fdb91a6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 4 Jan 2014 15:31:05 +0000 Subject: [PATCH] add a null-guard PR 53754 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1555356 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ .../org/apache/tools/ant/util/facade/FacadeTaskHelper.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index ca4dcef50..79ce9baa2 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -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: -------------- diff --git a/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java index ba77de2c1..08d477d38 100644 --- a/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java +++ b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java @@ -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()];