Merge 1.9.x branch into master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1899e40b Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1899e40b Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1899e40b Branch: refs/heads/master Commit: 1899e40b2e3e3297fcd0561b6ad52daffbebcba5 Parents: c53eb2b e3f5250 Author: Jaikiran Pai <jaiki...@apache.org> Authored: Fri Feb 9 12:44:37 2018 +0530 Committer: Jaikiran Pai <jaiki...@apache.org> Committed: Fri Feb 9 12:44:37 2018 +0530 ---------------------------------------------------------------------- WHATSNEW | 3 +++ src/etc/testcases/taskdefs/pathconvert.xml | 18 ++++++++++++++++++ .../org/apache/tools/ant/util/IdentityMapper.java | 10 +++++++++- .../tools/ant/taskdefs/PathConvertTest.java | 11 +++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1899e40b/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 457af52,2d4b6f1..75e48ff --- a/WHATSNEW +++ b/WHATSNEW @@@ -4,34 -4,12 +4,37 @@@ Changes from Ant 1.10.2 TO Ant 1.10. Fixed bugs: ----------- + * Fixed NullPointerException in ChainedMapper + Bugzilla Report 62086 + + * Fixed NullPointerException when a mappedresource is used in pathconvert + Bugzilla Report 62076 + -Changes from Ant 1.9.9 TO Ant 1.9.10 -==================================== +Changes from Ant 1.10.1 TO Ant 1.10.2 +===================================== + +Changes that could break older environments: +------------------------------------------- + + * updated the dependency of BCEL to 6.2. + Bugzilla Report 61196 + + * delete task previously would silently accept wildcard (*) + value for the "file" attribute. That's no longer the case + and an exception could get thrown by the underlying filesystem + for such use. Usage like: + + <delete file="/foo/bar/*.something"/> + + should instead be changed to use resource collections like: + + <delete> + <fileset dir="/foo/bar/" includes="*.something"/> + </delete> + + * Commons Net 3.6 is binary-code, but not source compatible; + see change list of Commons Net 3.0 for details * The Log4jListener is marked as deprecated as the required log4j library (in version 1.x) is not maintained any more. http://git-wip-us.apache.org/repos/asf/ant/blob/1899e40b/src/main/org/apache/tools/ant/util/IdentityMapper.java ---------------------------------------------------------------------- diff --cc src/main/org/apache/tools/ant/util/IdentityMapper.java index 548803d,18a31e5..dcfa023 --- a/src/main/org/apache/tools/ant/util/IdentityMapper.java +++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java @@@ -49,7 -47,15 +49,15 @@@ public class IdentityMapper implements * @return the source filename in a one-element array. */ @Override - public String[] mapFileName(final String sourceFileName) { + public String[] mapFileName(String sourceFileName) { - return new String[] { sourceFileName }; + if (sourceFileName == null) { + // The FileNameMapper#mapFileName contract states that: + // "if the given rule doesn't apply to the source file, + // implementation must return null" + // we consider a null source file name as non-matching and + // hence return null + return null; + } + return new String[] {sourceFileName}; } }
