You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/06/30 09:53:21 UTC
svn commit: r202502 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
Author: evenisse
Date: Thu Jun 30 00:53:20 2005
New Revision: 202502
URL: http://svn.apache.org/viewcvs?rev=202502&view=rev
Log:
[MNG-541]. Fix NullPointerException when mojo doesn't have parameters.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.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=202502&r1=202501&r2=202502&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 Thu Jun 30 00:53:20 2005
@@ -770,6 +770,11 @@
{
List parameters = goal.getParameters();
+ if ( parameters == null )
+ {
+ return;
+ }
+
for ( int i = 0; i < parameters.size(); i++ )
{
Parameter parameter = (Parameter) parameters.get( i );
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=202502&r1=202501&r2=202502&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java Thu Jun 30 00:53:20 2005
@@ -149,11 +149,14 @@
{
parameterMap = new HashMap();
- for ( Iterator iterator = parameters.iterator(); iterator.hasNext(); )
+ if ( parameters == null )
{
- Parameter pd = (Parameter) iterator.next();
+ for ( Iterator iterator = parameters.iterator(); iterator.hasNext(); )
+ {
+ Parameter pd = (Parameter) iterator.next();
- parameterMap.put( pd.getName(), pd );
+ parameterMap.put( pd.getName(), pd );
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org