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 2020/11/01 15:01:08 UTC
[commons-compress] 03/08: No need to nest else clause.
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-compress.git
commit cbdb1e270d525557cca23d76cfc8b4822804b34f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 1 08:53:11 2020 -0500
No need to nest else clause.
---
.../commons/compress/archivers/sevenz/SevenZFile.java | 5 ++---
.../commons/compress/archivers/zip/NioZipEncoding.java | 16 +++++++---------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 9b68457..5624b4c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -468,10 +468,9 @@ public class SevenZFile implements Closeable {
if (headerLooksValid) {
final StartHeader startHeader = readStartHeader(startHeaderCrc);
return initializeArchive(startHeader, password, true);
- } else {
- // No valid header found - probably first file of multipart archive was removed too early. Scan for end header.
- return tryToLocateEndHeader(password);
}
+ // No valid header found - probably first file of multipart archive was removed too early. Scan for end header.
+ return tryToLocateEndHeader(password);
}
private Archive tryToLocateEndHeader(final byte[] password) throws IOException {
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
index 4757074..ce9d124 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
@@ -167,11 +167,10 @@ class NioZipEncoding implements ZipEncoding, CharsetAccessor {
.onMalformedInput(CodingErrorAction.REPLACE)
.onUnmappableCharacter(CodingErrorAction.REPLACE)
.replaceWith(REPLACEMENT_BYTES);
- } else {
- return charset.newEncoder()
- .onMalformedInput(CodingErrorAction.REPORT)
- .onUnmappableCharacter(CodingErrorAction.REPORT);
}
+ return charset.newEncoder()
+ .onMalformedInput(CodingErrorAction.REPORT)
+ .onUnmappableCharacter(CodingErrorAction.REPORT);
}
private CharsetDecoder newDecoder() {
@@ -179,12 +178,11 @@ class NioZipEncoding implements ZipEncoding, CharsetAccessor {
return this.charset.newDecoder()
.onMalformedInput(CodingErrorAction.REPORT)
.onUnmappableCharacter(CodingErrorAction.REPORT);
- } else {
- return charset.newDecoder()
- .onMalformedInput(CodingErrorAction.REPLACE)
- .onUnmappableCharacter(CodingErrorAction.REPLACE)
- .replaceWith(REPLACEMENT_STRING);
}
+ return charset.newDecoder()
+ .onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .replaceWith(REPLACEMENT_STRING);
}
/**