bad merge
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/13249b71 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/13249b71 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/13249b71 Branch: refs/heads/master Commit: 13249b7193d9f3944e59d708e2ad813150bc72d3 Parents: e90f711 Author: Stefan Bodewig <bode...@apache.org> Authored: Fri Feb 9 19:01:49 2018 +0100 Committer: Stefan Bodewig <bode...@apache.org> Committed: Fri Feb 9 19:02:15 2018 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/util/FlatFileNameMapper.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/13249b71/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java index 37383b6..07ba4c6 100644 --- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java +++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java @@ -52,7 +52,6 @@ public class FlatFileNameMapper implements FileNameMapper { */ @Override public String[] mapFileName(String sourceFileName) { - return new String[] { new java.io.File(sourceFileName).getName() }; return sourceFileName == null ? null : new String[] {new java.io.File(sourceFileName).getName()}; }
