You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/01/28 14:27:20 UTC

maven git commit: [MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause

Repository: maven
Updated Branches:
  refs/heads/MNG-6147 [created] 4c9b59cc3


[MNG-6147] MetadataResolutionResult#getGraph() contains duplicate if clause


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4c9b59cc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4c9b59cc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4c9b59cc

Branch: refs/heads/MNG-6147
Commit: 4c9b59cc387c136582e185ac4849bcb9334270a5
Parents: 5b4b8bd
Author: Michael Osipov <mi...@apache.org>
Authored: Sat Jan 28 15:26:52 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Jan 28 15:26:52 2017 +0100

----------------------------------------------------------------------
 .../maven/repository/metadata/MetadataResolutionResult.java      | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/4c9b59cc/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..814b66c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -119,10 +119,6 @@ public class MetadataResolutionResult
         {
             return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test );
         }
-        else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) )
-        {
-            return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test );
-        }
         else if ( requestType.equals( MetadataResolutionRequestTypeEnum.graph ) )
         {
             return getGraph();