svn commit: r774885 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[bentmann]

Author: bentmann
Date: Thu May 14 19:13:45 2009
New Revision: 774885

URL: http://svn.apache.org/viewvc?rev=774885&view=rev
Log:
o Made plugin manager bail out if requested mojo can't be loaded to save 
clients from NPEs

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=774885&r1=774884&r2=774885&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Thu May 14 19:13:45 2009
@@ -493,13 +493,19 @@
         }
     }
 
-    public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, 
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories 
)
+    public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, 
ArtifactRepository localRepository,
+                                             List<ArtifactRepository> 
remoteRepositories )
         throws PluginLoaderException
     {
         PluginDescriptor pluginDescriptor = loadPlugin( plugin, 
localRepository, remoteRepositories );
 
         MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal );
 
+        if ( mojoDescriptor == null )
+        {
+            throw new PluginLoaderException( plugin, "Failed to load plugin 
mojo. Reason: Unknown mojo: " + goal );
+        }
+
         return mojoDescriptor;
     }