Repository: ant
Updated Branches:
  refs/heads/master e90f71193 -> 7ade15cb1


in 1.9.x we skip unmappable resouces in MappedResourceCollection


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

Branch: refs/heads/master
Commit: 7ade15cb162cfb8ddeb9992445d1ae53ca434f3f
Parents: 13249b7
Author: Stefan Bodewig <bode...@apache.org>
Authored: Fri Feb 9 18:56:57 2018 +0100
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Fri Feb 9 19:02:15 2018 +0100

----------------------------------------------------------------------
 .../apache/tools/ant/types/resources/MappedResourceCollection.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/7ade15cb/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
----------------------------------------------------------------------
diff --git 
a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java 
b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
index c870cc1..2b2f4f1 100644
--- 
a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
+++ 
b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.types.resources;
 import java.io.File;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.Stack;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -237,6 +238,7 @@ public class MappedResourceCollection
         if (enableMultipleMappings) {
             stream = nested.stream()
                 .flatMap(r -> Stream.of(m.mapFileName(r.getName()))
+                    .filter(Objects::nonNull)
                     .map(MergingMapper::new)
                     .map(mm -> new MappedResource(r, mm)));
         } else {

Reply via email to