From 7f1685bde0a38fd33564a09ff931488aff547ca9 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Fri, 9 Feb 2018 13:31:45 +0530 Subject: [PATCH] bz-62076 bz-39960 Expect the mapper to follow the FileNameMapper#mapFileName contract and move the check for null onto the entire returned array --- src/main/org/apache/tools/ant/taskdefs/Copy.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index 31901a6d8..42f7cb76f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -836,14 +836,11 @@ public class Copy extends Task { } for (int i = 0; i < toCopy.length; i++) { final String[] mappedFiles = mapper.mapFileName(toCopy[i].getName()); - for (int j = 0; j < mappedFiles.length; j++) { - if (mappedFiles[j] == null) { - throw new BuildException("Can't copy a resource without a" - + " name if the mapper doesn't" - + " provide one."); - } + if (mappedFiles == null) { + throw new BuildException("Can't copy a resource without a" + + " name if the mapper doesn't" + + " provide one."); } - if (!enableMultipleMappings) { map.put(toCopy[i], new String[] {new File(toDir, mappedFiles[0]).getAbsolutePath()});