From bc28d31407036126e05e4d64f2b138af69603c7a Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 8 Dec 2006 23:43:18 +0000 Subject: [PATCH] last minute; avoid NPE when attempting to map no-name resource. Bugzilla 39960. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@484850 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/util/ResourceUtils.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java index a9f2fa368..9b681a596 100644 --- a/src/main/org/apache/tools/ant/util/ResourceUtils.java +++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java @@ -155,12 +155,19 @@ public class ResourceUtils { Union result = new Union(); for (Iterator iter = source.iterator(); iter.hasNext();) { Resource sr = (Resource) iter.next(); - String[] targetnames = mapper.mapFileName( - sr.getName().replace('/', File.separatorChar)); + String srName = sr.getName(); + srName = srName == null + ? srName : srName.replace('/', File.separatorChar); + String[] targetnames = null; + try { + targetnames = mapper.mapFileName(srName); + } catch (Exception e) { + logTo.log("Caught " + e + " mapping resource " + sr, + Project.MSG_VERBOSE); + } if (targetnames == null || targetnames.length == 0) { - logTo.log(sr.getName() - + " skipped - don\'t know how to handle it", + logTo.log(sr + " skipped - don\'t know how to handle it", Project.MSG_VERBOSE); continue; }