svn commit: r931641 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

[ifedorenko]

Author: ifedorenko
Date: Wed Apr  7 18:58:53 2010
New Revision: 931641

URL: http://svn.apache.org/viewvc?rev=931641&view=rev
Log:
MNG-4628 ReactorArtifactRepository is not setup soon enough for 
AbstractMavenLifecycleParticipant#afterProjectsRead

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=931641&r1=931640&r2=931641&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
(original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
Wed Apr  7 18:58:53 2010
@@ -181,6 +181,23 @@ public class DefaultMaven
         
         result.setProject( session.getTopLevelProject() );
 
+        try
+        {
+            Map<String, MavenProject> projectMap;
+            projectMap = getProjectMap( session.getProjects() );
+    
+            // Desired order of precedence for local artifact repositories
+            //
+            // Reactor
+            // Workspace
+            // User Local Repository
+            delegatingLocalArtifactRepository.setBuildReactor( new 
ReactorArtifactRepository( projectMap, session ) );
+        }
+        catch ( org.apache.maven.DuplicateProjectException e )
+        {
+            return processResult( result, e );
+        }
+
         ClassLoader originalClassLoader = 
Thread.currentThread().getContextClassLoader();
         try
         {
@@ -200,11 +217,8 @@ public class DefaultMaven
             Thread.currentThread().setContextClassLoader( originalClassLoader 
);
         }
 
-        Map<String, MavenProject> projectMap;
         try
         {
-            projectMap = getProjectMap( session.getProjects() );
-
             ProjectSorter projectSorter = new ProjectSorter( 
session.getProjects() );
 
             ProjectDependencyGraph projectDependencyGraph = 
createDependencyGraph( projectSorter, request );
@@ -231,13 +245,6 @@ public class DefaultMaven
         }
 
         result.setTopologicallySortedProjects( session.getProjects() );
-
-        // Desired order of precedence for local artifact repositories
-        //
-        // Reactor
-        // Workspace
-        // User Local Repository
-        delegatingLocalArtifactRepository.setBuildReactor( new 
ReactorArtifactRepository( projectMap, session ) );
         
         if ( result.hasExceptions() )
         {