Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB4D81152B for ; Sun, 18 May 2014 09:10:42 +0000 (UTC) Received: (qmail 7362 invoked by uid 500); 18 May 2014 09:10:37 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 91185 invoked by uid 500); 18 May 2014 08:45:36 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 89927 invoked by uid 99); 18 May 2014 08:36:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 May 2014 08:36:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 May 2014 08:36:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E4EC238889B; Sun, 18 May 2014 08:36:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140518083610.0E4EC238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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