jvanzyl 2004/05/07 19:03:23
Modified: maven-core/src/main/java/org/apache/maven/plugin/manager
DefaultPluginManagerManager.java
Log:
o guard against the plugin having no parameters, rare but the hello plugin is an
example of a plugin that might do this.
Revision Changes Path
1.15 +13 -11
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java
Index: DefaultPluginManagerManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultPluginManagerManager.java 8 May 2004 00:50:35 -0000 1.14
+++ DefaultPluginManagerManager.java 8 May 2004 02:03:23 -0000 1.15
@@ -144,27 +144,29 @@
// ----------------------------------------------------------------------
// Create parameters for plugin execution
// ----------------------------------------------------------------------
- //!!! This could be moved to a utility class
public static Map createParameters( GoalDescriptor goalDescriptor, MavenProject
project )
{
- List parameters = goalDescriptor.getParameters();
-
- int size = parameters.size();
+ Map map = null;
- Map map = new HashMap();
+ List parameters = goalDescriptor.getParameters();
- for ( int i = 0; i < size; i++ )
+ if ( parameters != null )
{
- ParameterDescriptor c = (ParameterDescriptor) parameters.get( i );
+ map = new HashMap();
+
+ for ( int i = 0; i < parameters.size(); i++ )
+ {
+ ParameterDescriptor c = (ParameterDescriptor) parameters.get( i );
- String key = c.getName();
+ String key = c.getName();
- String expression = c.getExpression();
+ String expression = c.getExpression();
- Object value = OgnlProjectValueExtractor.evaluate( expression, project
);
+ Object value = OgnlProjectValueExtractor.evaluate( expression,
project );
- map.put( key, value );
+ map.put( key, value );
+ }
}
return map;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
