Author: brett
Date: Fri Sep 23 21:16:12 2005
New Revision: 291246

URL: http://svn.apache.org/viewcvs?rev=291246&view=rev
Log:
split command to narrow down NPE in integration environment

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=291246&r1=291245&r2=291246&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Fri Sep 23 21:16:12 2005
@@ -141,8 +141,9 @@
     {
         // TODO: since this is only used in the lifecycle executor, maybe it 
should be moved there? There is no other
         // use for the mapping manager in here
-        return pluginMappingManager.getByPrefix( prefix, 
session.getSettings().getPluginGroups(),
-                                                 
project.getPluginArtifactRepositories(),
+        Settings settings = session.getSettings();
+        List pluginGroups = settings.getPluginGroups();
+        return pluginMappingManager.getByPrefix( prefix, pluginGroups, 
project.getPluginArtifactRepositories(),
                                                  session.getLocalRepository() 
);
     }
 
@@ -271,7 +272,7 @@
         }
 
         artifactResolver.resolve( pluginArtifact, 
project.getPluginArtifactRepositories(), localRepository );
-        
+
         if ( !pluginArtifact.isResolved() )
         {
             throw new PluginContainerException( plugin, "Cannot resolve 
artifact for plugin." );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to