Browse Source

Java8 refactoring removed not-null guard

master
Stefan Bodewig 7 years ago
parent
commit
9873bf6c8a
2 changed files with 8 additions and 2 deletions
  1. +4
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  2. +4
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java

+ 4
- 1
src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java View File

@@ -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<String> 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);
}



+ 4
- 1
src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java View File

@@ -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<String> 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);
}



Loading…
Cancel
Save