You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/02/09 18:03:41 UTC
[1/2] ant git commit: in 1.9.x we skip unmappable resouces in
MappedResourceCollection
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 <bo...@apache.org>
Authored: Fri Feb 9 18:56:57 2018 +0100
Committer: Stefan Bodewig <bo...@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 {
[2/2] ant git commit: bad merge
Posted by bo...@apache.org.
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 <bo...@apache.org>
Authored: Fri Feb 9 19:01:49 2018 +0100
Committer: Stefan Bodewig <bo...@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()};
}