From cc03dc7c46a14713e86829e7072daa71fe9b01b6 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 11 Feb 2017 17:53:22 +0100 Subject: [PATCH 1/2] References #234, #235: Remove classloader closing code of PMD Ant Task Got lost, when #235 was rebased onto pmd/5.4.x --- .../sourceforge/pmd/ant/internal/PMDTaskImpl.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java index 1bfd598f70..8c8df56d22 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java @@ -3,7 +3,6 @@ */ package net.sourceforge.pmd.ant.internal; -import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -268,22 +267,11 @@ public class PMDTaskImpl { try { doTask(); } finally { - tryClose(configuration.getClassLoader()); logManager.close(); IOUtil.tryCloseClassLoader(configuration.getClassLoader()); } } - private static void tryClose(ClassLoader classLoader) { - if (classLoader instanceof Closeable) { - try { - ((Closeable) classLoader).close(); - } catch (IOException ignore) { - // do nothing. - } - } - } - private void logRulesUsed(RuleSets rules) { project.log("Using these rulesets: " + configuration.getRuleSets(), Project.MSG_VERBOSE); From 04a4145b1c693638275622568dd70e2fe6b55569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?= Date: Mon, 6 Feb 2017 12:18:49 -0300 Subject: [PATCH 2/2] [doc] Improve docs on InvalidSlf4jMessageFormatRule --- pmd-java/src/main/resources/rulesets/java/logging-java.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/rulesets/java/logging-java.xml b/pmd-java/src/main/resources/rulesets/java/logging-java.xml index 49e8120058..1d5bcb0539 100644 --- a/pmd-java/src/main/resources/rulesets/java/logging-java.xml +++ b/pmd-java/src/main/resources/rulesets/java/logging-java.xml @@ -167,7 +167,7 @@ otherwise skip the associate String creation and manipulation. class="net.sourceforge.pmd.lang.java.rule.logging.InvalidSlf4jMessageFormatRule" externalInfoUrl="${pmd.website.baseurl}/rules/java/logging-java.html#InvalidSlf4jMessageFormat"> -Check for invalid message format in slf4j loggers. +Check for messages in slf4j loggers with non matching number of arguments and placeholders. 5