You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2019/08/13 18:46:03 UTC

[commons-compress] 03/03: another Arrays.copyOf case

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git

commit 2bf678bbc6c6002569559b90ea29a031f035f067
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Tue Aug 13 20:45:41 2019 +0200

    another Arrays.copyOf case
---
 .../apache/commons/compress/archivers/zip/ZipArchiveEntry.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 620fa7d..585dfb2 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
@@ -510,14 +510,12 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
         return unparseableExtra != null ? getMergedFields() : extraFields;
     }
 
-    private ZipExtraField[] copyOf(final ZipExtraField[] src){
+    private ZipExtraField[] copyOf(final ZipExtraField[] src) {
         return copyOf(src, src.length);
     }
 
     private ZipExtraField[] copyOf(final ZipExtraField[] src, final int length) {
-        final ZipExtraField[] cpy = new ZipExtraField[length];
-        System.arraycopy(src, 0, cpy, 0, Math.min(src.length, length));
-        return cpy;
+        return Arrays.copyOf(src, length);
     }
 
     private ZipExtraField[] getMergedFields() {
@@ -821,9 +819,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
      */
     public byte[] getRawName() {
         if (rawName != null) {
-            final byte[] b = new byte[rawName.length];
-            System.arraycopy(rawName, 0, b, 0, rawName.length);
-            return b;
+            return Arrays.copyOf(rawName, rawName.length);
         }
         return null;
     }