Browse Source

Java8 refactoring stripped null check on manifest.getMainAttributes

master
Stefan Bodewig 7 years ago
parent
commit
c813b4d8d8
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java

+ 3
- 1
src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java View File

@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.jar.Attributes; import java.util.jar.Attributes;
import java.util.jar.Manifest; import java.util.jar.Manifest;
@@ -191,7 +192,8 @@ public final class Extension {
return new Extension[0]; return new Extension[0];
} }
return Stream return Stream
.concat(Stream.of(manifest.getMainAttributes()),
.concat(Optional.ofNullable(manifest.getMainAttributes())
.map(Stream::of).orElse(Stream.empty()),
manifest.getEntries().values().stream()) manifest.getEntries().values().stream())
.map(attrs -> getExtension("", attrs)).filter(Objects::nonNull) .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull)
.toArray(Extension[]::new); .toArray(Extension[]::new);


Loading…
Cancel
Save