maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1595572 - /maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Date Sun, 18 May 2014 08:36:09 GMT
Author: hboutemy
Date: Sun May 18 08:36:09 2014
New Revision: 1595572

URL: http://svn.apache.org/r1595572
Log:
[MSHARED-337] don't check canGenerateReport() since it is part of report generation, not execution/preparation

Modified:
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java?rev=1595572&r1=1595571&r2=1595572&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
(original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Sun May 18 08:36:09 2014
@@ -298,10 +298,8 @@ public class DefaultMavenReportExecutor
                                                            mavenReportExecutorRequest.getMavenSession()
);
             }
 
-            if ( canGenerateReport( mavenReport, mojoExecution ) )
-            {
-                reports.add( mavenReportExecution );
-            }
+            // ok, report is ready to generate
+            reports.add( mavenReportExecution );
         }
 
         return reports;
@@ -313,21 +311,6 @@ public class DefaultMavenReportExecutor
             && !project.getModules().isEmpty();
     }
 
-    private boolean canGenerateReport( MavenReport mavenReport, MojoExecution mojoExecution
)
-    {
-        ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-        try
-        {
-            Thread.currentThread().setContextClassLoader( mojoExecution.getMojoDescriptor().getRealm()
);
-
-            return mavenReport.canGenerateReport();
-        }
-        finally
-        {
-            Thread.currentThread().setContextClassLoader( originalClassLoader );
-        }
-    }
-
     private MavenReport getConfiguredMavenReport( MojoExecution mojoExecution, PluginDescriptor
pluginDescriptor,
                                                   MavenReportExecutorRequest mavenReportExecutorRequest
)
         throws PluginContainerException, PluginConfigurationException



Mime
View raw message