From e5861f6ae12faad65df424371ebc077e1c4d1a41 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 4 Nov 2014 13:41:53 -0800 Subject: [PATCH 1/4] Update MetadataResolutionResult.java --- .../apache/maven/repository/MetadataResolutionResult.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 209c36fa679a..dfd429c7e254 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -235,10 +235,10 @@ public MetadataResolutionResult addError( Exception e ) if ( exceptions == null ) { initList( exceptions ); + } else + { + exceptions.add( e ); } - - exceptions.add( e ); - return this; } From dad097c991f08e0bafc9b1d50d467dff657d8ce9 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 4 Nov 2014 14:08:43 -0800 Subject: [PATCH 2/4] Update MetadataResolutionResult.java --- .../apache/maven/repository/MetadataResolutionResult.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index dfd429c7e254..98f9886a9c39 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -234,11 +234,10 @@ public MetadataResolutionResult addError( Exception e ) { if ( exceptions == null ) { - initList( exceptions ); - } else - { - exceptions.add( e ); + exceptions = initList( exceptions ); } + exceptions.add( e ); + return this; } From f17fe994b67515dc9be79b10c1a3fa21874aff21 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 5 Nov 2014 07:46:56 -0800 Subject: [PATCH 3/4] Update MetadataResolutionResult.java --- .../org/apache/maven/repository/MetadataResolutionResult.java | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 98f9886a9c39..8ccbaa5a6a43 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -237,7 +237,6 @@ public MetadataResolutionResult addError( Exception e ) exceptions = initList( exceptions ); } exceptions.add( e ); - return this; } From 28c2d5a79796541fe0c0a9375a6da0b1d4ad2827 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 5 Nov 2014 07:53:18 -0800 Subject: [PATCH 4/4] Update MetadataResolutionResult.java --- .../apache/maven/repository/MetadataResolutionResult.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 8ccbaa5a6a43..9c49349c7002 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -232,10 +232,7 @@ public boolean hasErrorArtifactExceptions() public MetadataResolutionResult addError( Exception e ) { - if ( exceptions == null ) - { - exceptions = initList( exceptions ); - } + exceptions = initList( exceptions ); exceptions.add( e ); return this; }