Hi,

ReactorReader used ArtifactUtils in some places, but in others created
keys/versionless keys on its own. This inconsistency could cause
problems in the future. Attached patch fixes this problem.


-- 
Stanislav Ochotnicky <[email protected]>
Associate Software Engineer - Base Operating Systems Brno

PGP: 7B087241
Red Hat Inc.                               http://cz.redhat.com
From f82d77ab758e24248a6ddeea2130180a0b3b1fd6 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <[email protected]>
Date: Mon, 17 Jan 2011 18:26:14 +0100
Subject: [PATCH] Use ArtifactUtils when creating keys for ReactorReader

---
 .../main/java/org/apache/maven/ReactorReader.java  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java 
b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 62e181a..3d08c65 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -216,7 +216,7 @@ class ReactorReader
 
     public File findArtifact( Artifact artifact )
     {
-        String projectKey = artifact.getGroupId() + ':' + 
artifact.getArtifactId() + ':' + artifact.getVersion();
+        String projectKey = ArtifactUtils.key( artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion() );
 
         MavenProject project = projectsByGAV.get( projectKey );
 
@@ -230,7 +230,7 @@ class ReactorReader
 
     public List<String> findVersions( Artifact artifact )
     {
-        String key = artifact.getGroupId() + ':' + artifact.getArtifactId();
+        String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), 
artifact.getArtifactId() );
 
         List<MavenProject> projects = projectsByGA.get( key );
         if ( projects == null || projects.isEmpty() )
-- 
1.7.3.4

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to