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 be28519348a90ebc2649f1856d559dca2e23f2ab Author: Gary Gregory <[email protected]> AuthorDate: Wed Dec 28 17:46:30 2022 -0500 Use Arrays.copyOf() and copyOfRange() --- .../compress/archivers/zip/AbstractUnicodeExtraField.java | 11 ++--------- .../compressors/lz4/FramedLZ4CompressorInputStream.java | 3 +-- .../compressors/snappy/FramedSnappyCompressorInputStream.java | 3 +-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java index ac9b2629..8e629442 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java @@ -122,12 +122,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField { * @return The UTF-8 encoded name. */ public byte[] getUnicodeName() { - byte[] b = null; - if (unicodeName != null) { - b = new byte[unicodeName.length]; - System.arraycopy(unicodeName, 0, b, 0, b.length); - } - return b; + return unicodeName != null ? Arrays.copyOf(unicodeName, unicodeName.length) : null; } /** @@ -176,9 +171,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField { */ public void setUnicodeName(final byte[] unicodeName) { if (unicodeName != null) { - this.unicodeName = new byte[unicodeName.length]; - System.arraycopy(unicodeName, 0, this.unicodeName, 0, - unicodeName.length); + this.unicodeName = Arrays.copyOf(unicodeName, unicodeName.length); } else { this.unicodeName = null; } 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 3aabdad3..52ba760e 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 @@ -89,8 +89,7 @@ public class FramedLZ4CompressorInputStream extends CompressorInputStream byte[] shortenedSig = signature; if (signature.length > LZ4_SIGNATURE.length) { - shortenedSig = new byte[LZ4_SIGNATURE.length]; - System.arraycopy(signature, 0, shortenedSig, 0, LZ4_SIGNATURE.length); + shortenedSig = Arrays.copyOf(signature, LZ4_SIGNATURE.length); } return Arrays.equals(shortenedSig, LZ4_SIGNATURE); diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java index ccd18c8c..86f7bb70 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java @@ -78,8 +78,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream byte[] shortenedSig = signature; if (signature.length > SZ_SIGNATURE.length) { - shortenedSig = new byte[SZ_SIGNATURE.length]; - System.arraycopy(signature, 0, shortenedSig, 0, SZ_SIGNATURE.length); + shortenedSig = Arrays.copyOf(signature, SZ_SIGNATURE.length); } return Arrays.equals(shortenedSig, SZ_SIGNATURE);
