[MPLUGIN-114] PluginXdocGenerator NullPointerException

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@657562 13f79535-47bb-0310-9956-ffa450edef68
master
Benjamin Bentmann 2008-05-18 13:46:52 +00:00
parent f3a91b5cfd
commit bf2ece6f7a
3 changed files with 8 additions and 5 deletions

View File

@ -277,7 +277,7 @@ public class PluginReport
if ( !( pluginDescriptor.getMojos() != null && pluginDescriptor.getMojos().size() > 0 ) )
{
paragraph( getBundle( locale ).getString( "report.plugin.nogoal" ) );
paragraph( getBundle( locale ).getString( "report.plugin.goals.nogoal" ) );
endSection();
return;
}

View File

@ -93,10 +93,13 @@ public class PluginXdocGenerator
public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException
{
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
if ( pluginDescriptor.getMojos() != null )
{
MojoDescriptor descriptor = (MojoDescriptor) it.next();
processMojoDescriptor( descriptor, destinationDirectory );
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
{
MojoDescriptor descriptor = (MojoDescriptor) it.next();
processMojoDescriptor( descriptor, destinationDirectory );
}
}
}

View File

@ -192,7 +192,7 @@ public class DefaultMojoScannerTest
remainingGoals.remove( desc.getGoal() ) );
}
assertTrue( "Extpected goals missing from PluginDescriptor: " + remainingGoals, remainingGoals.size() == 0 );
assertTrue( "Expected goals missing from PluginDescriptor: " + remainingGoals, remainingGoals.size() == 0 );
}
}