You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ad...@apache.org on 2021/01/08 09:02:30 UTC
[maven-pmd-plugin] 02/02: [MPMD-314] - Avoid NPE for format "none"
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch pr-41
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit fb00aa5fa05c5e204218fdddb193d06cf612381a
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Fri Jan 8 10:01:42 2021 +0100
[MPMD-314] - Avoid NPE for format "none"
---
src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
index 9fec621..0eaf8e6 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
@@ -376,7 +376,7 @@ public class PmdExecutor extends Executor
*/
private void writeXmlReport( Report report ) throws MavenReportException
{
- File targetFile = writeReport( report, new XMLRenderer( request.getOutputEncoding() ), "xml" );
+ File targetFile = writeReport( report, new XMLRenderer( request.getOutputEncoding() ) );
if ( request.isIncludeXmlInSite() )
{
File siteDir = new File( request.getReportOutputDirectory() );
@@ -392,7 +392,7 @@ public class PmdExecutor extends Executor
}
}
- private File writeReport( Report report, Renderer r, String extension ) throws MavenReportException
+ private File writeReport( Report report, Renderer r ) throws MavenReportException
{
if ( r == null )
{
@@ -401,6 +401,7 @@ public class PmdExecutor extends Executor
File targetDir = new File( request.getTargetDirectory() );
targetDir.mkdirs();
+ String extension = r.defaultFileExtension();
File targetFile = new File( targetDir, "pmd." + extension );
LOG.debug( "Target PMD output file: {}", targetFile );
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( targetFile ),
@@ -430,7 +431,7 @@ public class PmdExecutor extends Executor
throws MavenReportException
{
Renderer renderer = createRenderer( request.getFormat(), request.getOutputEncoding() );
- writeReport( report, renderer, renderer.defaultFileExtension() );
+ writeReport( report, renderer );
}
/**