You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/09/24 14:03:33 UTC
logging-log4j2 git commit: Checkstyle: SUPPRESS doesn't seem to
work...
Repository: logging-log4j2
Updated Branches:
refs/heads/master adf0f9881 -> 36f32dd2d
Checkstyle: SUPPRESS doesn't seem to work...
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/36f32dd2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/36f32dd2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/36f32dd2
Branch: refs/heads/master
Commit: 36f32dd2dd0ef393ada6267451c11e6967c2ebad
Parents: adf0f98
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 24 14:03:26 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 24 14:03:26 2015 +0200
----------------------------------------------------------------------
checkstyle.xml | 7 +++++++
.../main/java/org/apache/logging/log4j/util/LoaderUtil.java | 5 ++---
.../java/org/apache/logging/log4j/util/ReflectionUtil.java | 5 ++---
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36f32dd2/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index 6534f9f..80ad14d 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -66,16 +66,23 @@
<!--<module name="SuppressionFilter">
<property name="file" value="conf/checkstyle-suppressions.xml"/>
</module> -->
+ <!--
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="Check\:OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="Check\:ON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>
+ -->
+ <module name="SuppressionCommentFilter" />
+ <module name="SuppressWithNearbyCommentFilter"/>
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
+ <!-- Ensure that CHECKSTYLE:OFF comments are available to the filter: -->
+ <module name="FileContentsHolder"/>
+
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36f32dd2/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 0019135..e881a3a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -24,6 +24,7 @@ import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Enumeration;
import java.util.LinkedHashSet;
+import java.util.Objects;
/**
* <em>Consider this class private.</em> Utility class for ClassLoaders.
@@ -253,9 +254,7 @@ public final class LoaderUtil {
@Override
public int hashCode() {
- int result = classLoader != null ? classLoader.hashCode() : 0;
- result = 31 * result + (url != null ? url.hashCode() : 0);
- return result;
+ return Objects.hashCode(classLoader) + Objects.hashCode(url);
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36f32dd2/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
index aaaacac..562cb65 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java
@@ -48,9 +48,8 @@ import org.apache.logging.log4j.status.StatusLogger;
* </p>
*/
public final class ReflectionUtil {
- // Check:OFF: ConstantName
- static final int JDK_7u25_OFFSET;
- // Check:ON: ConstantName
+ // Checkstyle Suppress: the lower-case 'u' ticks off CheckStyle...
+ static final int JDK_7u25_OFFSET; // SUPPRESS CHECKSTYLE
private static final Logger LOGGER = StatusLogger.getLogger();
private static final boolean SUN_REFLECTION_SUPPORTED;