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
The following commit(s) were added to refs/heads/master by this push:
new c936bba Minor change: (#206)
c936bba is described below
commit c936bba5b8f8d4e86ab753f9e04da100e883cb78
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Feb 20 01:38:51 2022 +0100
Minor change: (#206)
* Simplify conditions
* Make final var
---
.../compress/archivers/dump/DumpArchiveEntry.java | 4 ---
.../commons/compress/archivers/sevenz/Coders.java | 6 ++--
.../compress/archivers/tar/TarArchiveEntry.java | 37 ++++++++++------------
.../compress/archivers/zip/X7875_NewUnix.java | 2 +-
.../compress/archivers/zip/ZipArchiveEntry.java | 6 ++--
.../archivers/zip/ZipArchiveInputStream.java | 2 +-
.../lz4/FramedLZ4CompressorInputStream.java | 3 --
.../snappy/SnappyCompressorInputStream.java | 3 --
8 files changed, 25 insertions(+), 38 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
index 02643fa..fb339a6 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
@@ -410,10 +410,6 @@ public class DumpArchiveEntry implements ArchiveEntry {
final DumpArchiveEntry rhs = (DumpArchiveEntry) o;
- if (rhs.header == null) {
- return false;
- }
-
if (ino != rhs.ino) {
return false;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index e2fe69a..2e22461 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -47,7 +47,8 @@ class Coders {
private static final Map<SevenZMethod, CoderBase> CODER_MAP = new
HashMap<SevenZMethod, CoderBase>() {
private static final long serialVersionUID = 1664829131806520867L;
- {
+
+ {
put(SevenZMethod.COPY, new CopyDecoder());
put(SevenZMethod.LZMA, new LZMADecoder());
put(SevenZMethod.LZMA2, new LZMA2Decoder());
@@ -62,7 +63,8 @@ class Coders {
put(SevenZMethod.BCJ_ARM_THUMB_FILTER, new BCJDecoder(new
ARMThumbOptions()));
put(SevenZMethod.BCJ_SPARC_FILTER, new BCJDecoder(new
SPARCOptions()));
put(SevenZMethod.DELTA_FILTER, new DeltaDecoder());
- }};
+ }
+ };
static CoderBase findByMethod(final SevenZMethod method) {
return CODER_MAP.get(method);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 6b7c47d..9d906d4 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -1707,28 +1707,25 @@ public class TarArchiveEntry implements ArchiveEntry,
TarConstants, EntryStreamO
if (!preserveAbsolutePath) {
final String osname =
System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
- if (osname != null) {
-
- // Strip off drive letters!
- // REVIEW Would a better check be "(File.separator == '\')"?
-
- if (osname.startsWith("windows")) {
- if (fileName.length() > 2) {
- final char ch1 = fileName.charAt(0);
- final char ch2 = fileName.charAt(1);
-
- if (ch2 == ':'
- && (ch1 >= 'a' && ch1 <= 'z'
- || ch1 >= 'A' && ch1 <= 'Z')) {
- fileName = fileName.substring(2);
- }
- }
- } else if (osname.contains("netware")) {
- final int colon = fileName.indexOf(':');
- if (colon != -1) {
- fileName = fileName.substring(colon + 1);
+ // Strip off drive letters!
+ // REVIEW Would a better check be "(File.separator == '\')"?
+
+ if (osname.startsWith("windows")) {
+ if (fileName.length() > 2) {
+ final char ch1 = fileName.charAt(0);
+ final char ch2 = fileName.charAt(1);
+
+ if (ch2 == ':'
+ && (ch1 >= 'a' && ch1 <= 'z'
+ || ch1 >= 'A' && ch1 <= 'Z')) {
+ fileName = fileName.substring(2);
}
}
+ } else if (osname.contains("netware")) {
+ final int colon = fileName.indexOf(':');
+ if (colon != -1) {
+ fileName = fileName.substring(colon + 1);
+ }
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
index bf63439..d225454 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
@@ -319,7 +319,7 @@ public class X7875_NewUnix implements ZipExtraField,
Cloneable, Serializable {
*/
static byte[] trimLeadingZeroesForceMinLength(final byte[] array) {
if (array == null) {
- return array;
+ return null;
}
int pos = 0;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index bb3208e..4554e12 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -776,8 +776,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
*/
@Override
public boolean isDirectory() {
- final String n = getName();
- return n != null && n.endsWith("/");
+ return getName().endsWith("/");
}
/**
@@ -894,8 +893,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
// on the super.hashCode() method since super.getName() always return
// the empty string in the current implementation (there's no setter)
// so it is basically draining the performance of a hashmap lookup
- final String n = getName();
- return (n == null ? "" : n).hashCode();
+ return getName().hashCode();
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 1e73c8f..b303236 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -125,7 +125,7 @@ public class ZipArchiveInputStream extends
ArchiveInputStream implements InputSt
* https://issues.apache.org/jira/projects/COMPRESS/issues/COMPRESS-555
*
https://github.com/apache/commons-compress/pull/137#issuecomment-690835644
*/
- private boolean allowStoredEntriesWithDataDescriptor;
+ private final boolean allowStoredEntriesWithDataDescriptor;
/** Count decompressed bytes for current entry */
private long uncompressedCount;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
index 99ed3ca..85efd9e 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
@@ -249,9 +249,6 @@ public class FramedLZ4CompressorInputStream extends
CompressorInputStream
final long len = ByteUtils.fromLittleEndian(supplier, 4);
final boolean uncompressed = (len & UNCOMPRESSED_FLAG_MASK) != 0;
final int realLen = (int) (len & (~UNCOMPRESSED_FLAG_MASK));
- if (realLen < 0) {
- throw new IOException("Found illegal block with negative size");
- }
if (realLen == 0) {
verifyContentChecksum();
if (!decompressConcatenated) {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
index 8b5625b..984aca9 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
@@ -159,9 +159,6 @@ public class SnappyCompressorInputStream extends
AbstractLZ77CompressorInputStre
*/
length = 4 + ((b >> 2) & 0x07);
- if (length < 0) {
- throw new IOException("Illegal block with a negative match
length found");
- }
uncompressedBytesRemaining -= length;
offset = (b & 0xE0) << 3;
b = readOneByte();
