Author: evenisse
Date: Tue Jun 28 00:06:03 2005
New Revision: 202142
URL: http://svn.apache.org/viewcvs?rev=202142&view=rev
Log:
Add a check on objects return by DefaultPluginManager.getReports for MNG-530
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=202142&r1=202141&r2=202142&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
Tue Jun 28 00:06:03 2005
@@ -765,11 +765,17 @@
try
{
List reportSets = reportPlugin.getReportSets();
+
+ List reportsList = new ArrayList();
+
if ( reportSets == null || reportSets.isEmpty() )
{
- reports.addAll(
- pluginManager.getReports(
reportPlugin.getGroupId(), reportPlugin.getArtifactId(),
-
reportPlugin.getVersion(), null, session, project ) );
+ reportsList = pluginManager.getReports(
reportPlugin.getGroupId(),
+
reportPlugin.getArtifactId(),
+
reportPlugin.getVersion(),
+ null,
+ session,
+ project );
}
else
@@ -778,9 +784,23 @@
{
ReportSet reportSet = (ReportSet) j.next();
- reports.addAll(
- pluginManager.getReports(
reportPlugin.getGroupId(), reportPlugin.getArtifactId(),
-
reportPlugin.getVersion(), reportSet, session, project ) );
+ reportsList = pluginManager.getReports(
reportPlugin.getGroupId(),
+
reportPlugin.getArtifactId(),
+
reportPlugin.getVersion(),
+ reportSet,
+ session,
+ project );
+ }
+ }
+
+ for ( Iterator i = reportsList.iterator(); i.hasNext(); )
+ {
+ Object obj = i.next();
+
+ //TODO: Remove this test when getReports will return
only reports object
+ if ( obj instanceof MavenReport )
+ {
+ reports.add( obj );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
