Author: vsiveton
Date: Fri May 25 05:29:02 2007
New Revision: 541624
URL: http://svn.apache.org/viewvc?view=rev&rev=541624
Log:
MNG-2981: [PATCH] NPE in PluginXDocGenerator while creating plugin site
Submitted by: Steve Rowe and Jason Melnick
Reviewed by: Vincent Siveton
o patch applied
Modified:
maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
Modified:
maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?view=diff&rev=541624&r1=541623&r2=541624
==============================================================================
---
maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
(original)
+++
maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
Fri May 25 05:29:02 2007
@@ -250,17 +250,20 @@
{
List filtered = new ArrayList();
- for ( Iterator parameters = parameterList.iterator();
parameters.hasNext(); )
+ if ( parameterList != null )
{
- Parameter parameter = (Parameter) parameters.next();
-
- if ( parameter.isEditable() )
+ for ( Iterator parameters = parameterList.iterator();
parameters.hasNext(); )
{
- String expression = parameter.getExpression();
+ Parameter parameter = (Parameter) parameters.next();
- if ( expression == null || !expression.startsWith(
"${component." ) )
+ if ( parameter.isEditable() )
{
- filtered.add( parameter );
+ String expression = parameter.getExpression();
+
+ if ( expression == null || !expression.startsWith(
"${component." ) )
+ {
+ filtered.add( parameter );
+ }
}
}
}
@@ -417,4 +420,5 @@
return list;
}
}
+
