Repository: ant Updated Branches: refs/heads/master 6850ad2e6 -> c813b4d8d
Java8 refactoring stripped null check on manifest.getMainAttributes Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c813b4d8 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c813b4d8 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c813b4d8 Branch: refs/heads/master Commit: c813b4d8d8b72f6c1caf7611aa60771aa70405b3 Parents: 6850ad2 Author: Stefan Bodewig <bode...@apache.org> Authored: Tue Feb 13 20:42:32 2018 +0100 Committer: Stefan Bodewig <bode...@apache.org> Committed: Tue Feb 13 20:42:32 2018 +0100 ---------------------------------------------------------------------- .../apache/tools/ant/taskdefs/optional/extension/Extension.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/c813b4d8/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java index a0c7e9d..f4bd77b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.StringTokenizer; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -191,7 +192,8 @@ public final class Extension { return new Extension[0]; } return Stream - .concat(Stream.of(manifest.getMainAttributes()), + .concat(Optional.ofNullable(manifest.getMainAttributes()) + .map(Stream::of).orElse(Stream.empty()), manifest.getEntries().values().stream()) .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull) .toArray(Extension[]::new);
