Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E71B18A2D for ; Fri, 25 Mar 2016 15:05:25 +0000 (UTC) Received: (qmail 71286 invoked by uid 500); 25 Mar 2016 15:05:25 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 70854 invoked by uid 500); 25 Mar 2016 15:05:25 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 70760 invoked by uid 99); 25 Mar 2016 15:05:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Mar 2016 15:05:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0238EDFDE0; Fri, 25 Mar 2016 15:05:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bodewig@apache.org To: commits@commons.apache.org Date: Fri, 25 Mar 2016 15:05:25 -0000 Message-Id: In-Reply-To: <71b646a0c9474411829f43481c32a249@git.apache.org> References: <71b646a0c9474411829f43481c32a249@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] commons-compress git commit: unused code unused code Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/b36f7c92 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/b36f7c92 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/b36f7c92 Branch: refs/heads/master Commit: b36f7c929886b2159a6f57df6490ca6b1669de43 Parents: 35dddc6 Author: Stefan Bodewig Authored: Fri Mar 25 15:58:58 2016 +0100 Committer: Stefan Bodewig Committed: Fri Mar 25 15:58:58 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/compress/archivers/tar/TarUtils.java | 1 - .../archivers/zip/X0017_StrongEncryptionHeader.java | 1 - .../compress/archivers/zip/ZipArchiveOutputStream.java | 9 --------- 3 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b36f7c92/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java index 204debf..28f7164 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java @@ -595,7 +595,6 @@ public class TarUtils { long unsignedSum = 0; long signedSum = 0; - int digits = 0; for (int i = 0; i < header.length; i++) { byte b = header[i]; if (CHKSUM_OFFSET <= i && i < CHKSUM_OFFSET + CHKSUMLEN) { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b36f7c92/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java index 11c25ea..c28e88c 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java @@ -415,7 +415,6 @@ public class X0017_StrongEncryptionHeader extends PKWareExtraHeader implements Z this.ivData = new byte[ivSize]; System.arraycopy(data, offset + 4, this.ivData, 0, ivSize); - long size = ZipLong.getValue(data, offset + ivSize + 2); this.format = ZipShort.getValue(data, offset + ivSize + 6); this.algId = EncryptionAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + ivSize + 8)); this.bitlen = ZipShort.getValue(data, offset + ivSize + 10); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b36f7c92/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java index 0fe28b1..65d6bad 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java @@ -111,15 +111,6 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { /** indicates if this archive is finished. protected for use in Jar implementation */ protected boolean finished = false; - /* - * Apparently Deflater.setInput gets slowed down a lot on Sun JVMs - * when it gets handed a really big buffer. See - * https://issues.apache.org/bugzilla/show_bug.cgi?id=45396 - * - * Using a buffer size of 8 kB proved to be a good compromise - */ - private static final int DEFLATER_BLOCK_SIZE = 8192; - /** * Compression method for deflated entries. */