You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/08/23 15:23:14 UTC
[commons-io] branch master updated: Control flow issues (#93)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 58324c1 Control flow issues (#93)
58324c1 is described below
commit 58324c1cfb9814b390a8750b0ba97dc5367817a8
Author: 赖床小能手 <51...@qq.com>
AuthorDate: Fri Aug 23 23:23:09 2019 +0800
Control flow issues (#93)
* Control flow issues
---
src/main/java/org/apache/commons/io/FilenameUtils.java | 5 +----
src/main/java/org/apache/commons/io/IOUtils.java | 4 ++--
src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java
index 5bb415b..abc65ef 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -1615,10 +1615,7 @@ public class FilenameUtils {
}
validOctets++;
}
- if (validOctets > IPV6_MAX_HEX_GROUPS || (validOctets < IPV6_MAX_HEX_GROUPS && !containsCompressedZeroes)) {
- return false;
- }
- return true;
+ return validOctets <= IPV6_MAX_HEX_GROUPS && (validOctets >= IPV6_MAX_HEX_GROUPS || containsCompressedZeroes);
}
private static final Pattern REG_NAME_PART_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9-]*$");
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java b/src/main/java/org/apache/commons/io/IOUtils.java
index 0c6fc4b..2735cc2 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -778,11 +778,11 @@ public class IOUtils {
String line1 = br1.readLine();
String line2 = br2.readLine();
- while (line1 != null && line2 != null && line1.equals(line2)) {
+ while (line1 != null && line1.equals(line2)) {
line1 = br1.readLine();
line2 = br2.readLine();
}
- return line1 == null ? line2 == null ? true : false : line1.equals(line2);
+ return Objects.equals(line1, line2);
}
/**
diff --git a/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java
index b555fba..35c114f 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java
@@ -142,7 +142,7 @@ public class AgeFileFilter extends AbstractFileFilter implements Serializable {
@Override
public boolean accept(final File file) {
final boolean newer = FileUtils.isFileNewer(file, cutoff);
- return acceptOlder ? !newer : newer;
+ return acceptOlder != newer;
}
/**
diff --git a/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java
index 3ddbac2..e509ba3 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java
@@ -90,7 +90,7 @@ public class SizeFileFilter extends AbstractFileFilter implements Serializable {
@Override
public boolean accept(final File file) {
final boolean smaller = file.length() < size;
- return acceptLarger ? !smaller : smaller;
+ return acceptLarger != smaller;
}
/**