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 DDE93200B97 for ; Sat, 24 Sep 2016 17:19:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DCF33160AE9; Sat, 24 Sep 2016 15:19:26 +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 037F5160AE6 for ; Sat, 24 Sep 2016 17:19:25 +0200 (CEST) Received: (qmail 84209 invoked by uid 500); 24 Sep 2016 15:19:24 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 83880 invoked by uid 99); 24 Sep 2016 15:19:24 -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; Sat, 24 Sep 2016 15:19:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD033F0BE3; Sat, 24 Sep 2016 15:19:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: khmarbaise@apache.org To: commits@maven.apache.org Date: Sat, 24 Sep 2016 15:19:36 -0000 Message-Id: <8531fdad32884bb8bad4f5b7da10bad2@git.apache.org> In-Reply-To: <4a6a217db89e4c02a1c00e3eb39c87fc@git.apache.org> References: <4a6a217db89e4c02a1c00e3eb39c87fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/33] maven git commit: [MNG-5670] guard against ConcurrentModificationException [MNG-6053] guard against key without value archived-at: Sat, 24 Sep 2016 15:19:27 -0000 [MNG-5670] guard against ConcurrentModificationException [MNG-6053] guard against key without value Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/53077505 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/53077505 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/53077505 Branch: refs/heads/MNG-6056-feature-toggle Commit: 53077505a7e9408565ec30a43ad243c41189a94e Parents: 32ce349 Author: Christian Schulte Authored: Thu Jul 28 17:20:20 2016 +0200 Committer: Christian Schulte Committed: Thu Jul 28 17:21:10 2016 +0200 ---------------------------------------------------------------------- .../maven/repository/internal/MavenRepositorySystemUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/53077505/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java index fa009f7..877c277 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java @@ -137,17 +137,15 @@ public final class MavenRepositorySystemUtils try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() ) { System.getProperties().store( out, null ); - out.close(); try ( final ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() ) ) { systemProperties.load( in ); - in.close(); } } catch ( final IOException e ) { - throw new AssertionError( "Unexpected IO error copying system properties." ); + throw new AssertionError( "Unexpected IO error copying system properties.", e ); } session.setSystemProperties( systemProperties );