Skip to content

Commit 58324c1

Browse files
Mixpagarydgregory
authored andcommitted
Control flow issues (#93)
* Control flow issues
1 parent c126bdd commit 58324c1

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/main/java/org/apache/commons/io/FilenameUtils.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,10 +1615,7 @@ private static boolean isIPv6Address(final String inet6Address) {
16151615
}
16161616
validOctets++;
16171617
}
1618-
if (validOctets > IPV6_MAX_HEX_GROUPS || (validOctets < IPV6_MAX_HEX_GROUPS && !containsCompressedZeroes)) {
1619-
return false;
1620-
}
1621-
return true;
1618+
return validOctets <= IPV6_MAX_HEX_GROUPS && (validOctets >= IPV6_MAX_HEX_GROUPS || containsCompressedZeroes);
16221619
}
16231620

16241621
private static final Pattern REG_NAME_PART_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9-]*$");

src/main/java/org/apache/commons/io/IOUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,11 +778,11 @@ public static boolean contentEqualsIgnoreEOL(final Reader input1, final Reader i
778778

779779
String line1 = br1.readLine();
780780
String line2 = br2.readLine();
781-
while (line1 != null && line2 != null && line1.equals(line2)) {
781+
while (line1 != null && line1.equals(line2)) {
782782
line1 = br1.readLine();
783783
line2 = br2.readLine();
784784
}
785-
return line1 == null ? line2 == null ? true : false : line1.equals(line2);
785+
return Objects.equals(line1, line2);
786786
}
787787

788788
/**

src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public AgeFileFilter(final File cutoffReference, final boolean acceptOlder) {
142142
@Override
143143
public boolean accept(final File file) {
144144
final boolean newer = FileUtils.isFileNewer(file, cutoff);
145-
return acceptOlder ? !newer : newer;
145+
return acceptOlder != newer;
146146
}
147147

148148
/**

src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public SizeFileFilter(final long size, final boolean acceptLarger) {
9090
@Override
9191
public boolean accept(final File file) {
9292
final boolean smaller = file.length() < size;
93-
return acceptLarger ? !smaller : smaller;
93+
return acceptLarger != smaller;
9494
}
9595

9696
/**

0 commit comments

Comments
 (0)