Updated Branches: refs/heads/master 5ad8e34e6 -> 0824df85f
little code simplification Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0824df85 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0824df85 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0824df85 Branch: refs/heads/master Commit: 0824df85f3fbe8ec08ec787749fffdf4b3a8ea21 Parents: 5ad8e34 Author: Hervé Boutemy <hbout...@apache.org> Authored: Thu Jan 17 22:04:09 2013 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Thu Jan 17 22:04:09 2013 +0100 ---------------------------------------------------------------------- .../internal/DefaultVersionResolver.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0824df85/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java index e31e94e..f360e33 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java @@ -68,7 +68,7 @@ import org.sonatype.aether.util.listener.DefaultRepositoryEvent; import org.sonatype.aether.util.metadata.DefaultMetadata; /** - * Maven version resolver: supports <code>*-SNAPSHOT</code>, <code>RELEASE</code> and <code>LATEST</code> + * Maven meta-version resolver: supports <code>*-SNAPSHOT</code>, <code>RELEASE</code> and <code>LATEST</code> * meta-version resolution from * <a href="../maven-repository-metadata/repository-metadata.html#class_versioning"><code>versioning</code> * element in repositories' <code>maven-metadata.xml</code></a>. @@ -293,11 +293,11 @@ public class DefaultVersionResolver { throw new VersionResolutionException( result ); } - } - if ( cacheKey != null && metadata != null && isSafelyCacheable( session, artifact ) ) - { - cache.put( session, cacheKey, new Record( result.getVersion(), result.getRepository() ) ); + if ( cacheKey != null && isSafelyCacheable( session, artifact ) ) + { + cache.put( session, cacheKey, new Record( result.getVersion(), result.getRepository() ) ); + } } return result;
