svn commit: r997185 - /maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java

[hboutemy]

Author: hboutemy
Date: Wed Sep 15 04:30:37 2010
New Revision: 997185

URL: http://svn.apache.org/viewvc?rev=997185&view=rev
Log:
[ARCHETYPE-320] avoid contacting central or any other repo when archetype is 
fully determined by properties

Modified:
    
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java

Modified: 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=997185&r1=997184&r2=997185&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
 (original)
+++ 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
 Wed Sep 15 04:30:37 2010
@@ -59,13 +59,15 @@ public class DefaultArchetypeSelector
     {
         ArchetypeDefinition definition = new ArchetypeDefinition( request );
 
-        Map<String, List<Archetype>> archetypes = getArchetypesByCatalog( 
catalogs );
-
         if ( definition.isDefined() && StringUtils.isNotEmpty( 
request.getArchetypeRepository() ) )
         {
             getLogger().info( "Archetype defined by properties" );
+            return;
         }
-        else if ( definition.isDefined() )
+
+        Map<String, List<Archetype>> archetypes = getArchetypesByCatalog( 
catalogs );
+
+        if ( definition.isDefined() )
         {
             Map.Entry<String, Archetype> found =
                 findArchetype( archetypes, request.getArchetypeGroupId(), 
request.getArchetypeArtifactId() );