[4/6] ant git commit: Java8 refactoring also removed null check on mappers

[bo...@apache.org]

Java8 refactoring also removed null check on mappers


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/82f7d9be
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/82f7d9be
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/82f7d9be

Branch: refs/heads/master
Commit: 82f7d9be1dddb66d9e516ef636783dd11b7bbb0b
Parents: e8117b6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 16:58:32 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 16:58:32 2018 +0100

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/util/ChainedMapper.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/82f7d9be/src/main/org/apache/tools/ant/util/ChainedMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index cec4f2e..fcf64ae 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -36,6 +36,7 @@ public class ChainedMapper extends ContainerMapper {
         // resources have a null name and users may use a mapper like
         // MergeMapper to provide a name for it.
         String[] result = getMappers().stream()
+            .filter(Objects::nonNull)
             .reduce(new String[] { sourceFileName }, (i, m) -> Stream.of(i)
                 .map(m::mapFileName).filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new),
                 (i, o) -> o);