You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/25 18:48:33 UTC
svn commit: r788423 - in /maven/plugins/trunk/maven-ant-plugin/src:
it/javadoc-it/pom.xml
main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Author: bentmann
Date: Thu Jun 25 16:48:33 2009
New Revision: 788423
URL: http://svn.apache.org/viewvc?rev=788423&view=rev
Log:
[MANT-52] NullPointerException when maven-javadoc-plugin configuration defines multiple group elements within a groups list element.
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml?rev=788423&r1=788422&r2=788423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml Thu Jun 25 16:48:33 2009
@@ -49,6 +49,16 @@
<head>Software Requirement:</head>
</tag>
</tags>
+ <groups>
+ <group>
+ <title>Repository API</title>
+ <packages>org.openrdf.repository*</packages>
+ </group>
+ <group>
+ <title>RDF Model API</title>
+ <packages>org.openrdf.model*</packages>
+ </group>
+ </groups>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=788423&r1=788422&r2=788423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java Thu Jun 25 16:48:33 2009
@@ -332,9 +332,10 @@
{
for ( int i = 0; i < groups.length; i++ )
{
+ Map group = (Map) groups[i].get( "group" );
writer.startElement( "group" );
- writer.addAttribute( "title", (String) groups[i].get( "title" ) );
- addWrapAttribute( writer, "javadoc", "package", (String) groups[i].get( "package" ), 4 );
+ writer.addAttribute( "title", (String) group.get( "title" ) );
+ addWrapAttribute( writer, "javadoc", "package", (String) group.get( "package" ), 4 );
writer.endElement(); // group
}
}