You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/05 23:47:39 UTC
svn commit: r634071 -
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Author: brianf
Date: Wed Mar 5 14:47:37 2008
New Revision: 634071
URL: http://svn.apache.org/viewvc?rev=634071&view=rev
Log:
reversed if for readability and optimization. Added some comments
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=634071&r1=634070&r2=634071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Wed Mar 5 14:47:37 2008
@@ -299,8 +299,13 @@
// set the recommended version
// TODO: maybe its better to just pass the range through to retrieval and use a transformation?
ArtifactVersion version;
- if ( !artifact.isSelectedVersionKnown() )
+ if ( artifact.isSelectedVersionKnown() )
{
+ version = artifact.getSelectedVersion();
+ }
+ else
+ {
+ //go find the version
List versions = artifact.getAvailableVersions();
if ( versions == null )
{
@@ -329,11 +334,10 @@
}
}
}
- else
- {
- version = artifact.getSelectedVersion();
- }
+ //this is dangerous because artifact.getSelectedVersion() can
+ //return null. However it is ok here because we first check if the
+ //selected version is known. As currently coded we can't get a null here.
artifact.selectVersion( version.toString() );
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}