From 9873bf6c8ae3fdd2cebe5c6083b6265827142b1c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 14 Feb 2018 14:31:03 +0100 Subject: [PATCH] Java8 refactoring removed not-null guard --- src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java | 5 ++++- .../tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 9aa1b491b..3e36a2fdf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -34,6 +34,7 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.StringTokenizer; import java.util.Vector; @@ -1009,7 +1010,9 @@ public class FTP extends Task implements FTPTaskConfig { Predicate test = isCaseSensitive() ? lastpathelement::equals : lastpathelement::equalsIgnoreCase; - return Stream.of(theFiles).filter(f -> test.test(f.getName())) + return Stream.of(theFiles) + .filter(Objects::nonNull) + .filter(f -> test.test(f.getName())) .findFirst().orElse(null); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index 2ad81dbe7..3bff2d9fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -33,6 +33,7 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.StringTokenizer; import java.util.Vector; @@ -913,7 +914,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { Predicate test = isCaseSensitive() ? lastpathelement::equals : lastpathelement::equalsIgnoreCase; - return Stream.of(theFiles).filter(f -> test.test(f.getName())) + return Stream.of(theFiles) + .filter(Objects::nonNull) + .filter(f -> test.test(f.getName())) .findFirst().orElse(null); }