svn commit: r609577 - /maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java

[vs...@apache.org]

Author: vsiveton
Date: Mon Jan  7 03:46:27 2008
New Revision: 609577

URL: http://svn.apache.org/viewvc?rev=609577&view=rev
Log:
o merged r609576 (MNG-2925: NullPointerException in PluginDescriptor.getMojo() if there's no mojo in pom.xml)

Modified:
    maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java

Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=609577&r1=609576&r2=609577&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Mon Jan  7 03:46:27 2008
@@ -60,7 +60,7 @@
     private boolean inheritedByDefault = true;
 
     private List artifacts;
-    
+
     private Map lifecycleMappings;
 
     private ClassRealm classRealm;
@@ -258,6 +258,11 @@
 
     public MojoDescriptor getMojo( String goal )
     {
+        if ( getMojos() == null )
+        {
+            return null; // no mojo in this POM
+        }
+
         // TODO: could we use a map? Maybe if the parent did that for components too, as this is too vulnerable to
         // changes above not being propogated to the map
 
@@ -329,22 +334,22 @@
     {
         return introducedDependencyArtifacts != null ? introducedDependencyArtifacts : Collections.EMPTY_SET;
     }
-    
+
     public void setName( String name )
     {
         this.name = name;
     }
-    
+
     public String getName()
     {
         return name;
     }
-    
+
     public void setDescription( String description )
     {
         this.description = description;
     }
-    
+
     public String getDescription()
     {
         return description;