Browse Source

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
master
Matthew Jason Benson 18 years ago
parent
commit
bc28d31407
1 changed files with 11 additions and 4 deletions
  1. +11
    -4
      src/main/org/apache/tools/ant/util/ResourceUtils.java

+ 11
- 4
src/main/org/apache/tools/ant/util/ResourceUtils.java View File

@@ -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;
}


Loading…
Cancel
Save