From c813b4d8d8b72f6c1caf7611aa60771aa70405b3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 13 Feb 2018 20:42:32 +0100
Subject: [PATCH] Java8 refactoring stripped null check on
 manifest.getMainAttributes

---
 .../tools/ant/taskdefs/optional/extension/Extension.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 a0c7e9d6e..f4bd77b98 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);