Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 12F55200CBD for ; Thu, 6 Jul 2017 09:53:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 11BFF165B04; Thu, 6 Jul 2017 07:53:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 557ED165B02 for ; Thu, 6 Jul 2017 09:53:56 +0200 (CEST) Received: (qmail 66446 invoked by uid 500); 6 Jul 2017 07:53:55 -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 66421 invoked by uid 99); 6 Jul 2017 07:53:55 -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; Thu, 06 Jul 2017 07:53:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DA8DE10F8; Thu, 6 Jul 2017 07:53:54 +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: Thu, 06 Jul 2017 07:53:56 -0000 Message-Id: <92e57cc689094e0bbd0750d5778e0d28@git.apache.org> In-Reply-To: <8d6acc2230774e5da9c1d8004553908d@git.apache.org> References: <8d6acc2230774e5da9c1d8004553908d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] commons-compress git commit: don't modify method parameters archived-at: Thu, 06 Jul 2017 07:53:57 -0000 don't modify method parameters Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/cd90f9ea Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/cd90f9ea Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/cd90f9ea Branch: refs/heads/master Commit: cd90f9ea24823be24133075130cc7cf899527620 Parents: 1ce02e0 Author: Stefan Bodewig Authored: Thu Jul 6 09:47:20 2017 +0200 Committer: Stefan Bodewig Committed: Thu Jul 6 09:47:20 2017 +0200 ---------------------------------------------------------------------- .../apache/commons/compress/archivers/zip/NioZipEncoding.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/cd90f9ea/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java ---------------------------------------------------------------------- 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 b23832e..323f838 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 @@ -134,14 +134,15 @@ class NioZipEncoding implements ZipEncoding, HasCharset { } private static ByteBuffer encodeFully(CharsetEncoder enc, CharBuffer cb, ByteBuffer out) { + ByteBuffer o = out; while (cb.hasRemaining()) { - CoderResult result = enc.encode(cb, out, false); + CoderResult result = enc.encode(cb, o, false); if (result.isOverflow()) { int increment = estimateIncrementalEncodingSize(enc, cb.remaining()); - out = ZipEncodingHelper.growBufferBy(out, increment); + o = ZipEncodingHelper.growBufferBy(o, increment); } } - return out; + return o; } private static final char[] HEX_CHARS = new char[] {