[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 <[email protected]> Authored: Thu Jul 28 17:20:20 2016 +0200 Committer: Christian Schulte <[email protected]> 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 );
