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 11:44:12 UTC
logging-log4j2 git commit: Checkstyle: trailing spaces
Repository: logging-log4j2
Updated Branches:
refs/heads/master 1d5e7f50b -> 597ec4ecd
Checkstyle: trailing spaces
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/597ec4ec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/597ec4ec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/597ec4ec
Branch: refs/heads/master
Commit: 597ec4ecdc99c3a21b9f84f00e4493f61fc26ea5
Parents: 1d5e7f5
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 24 11:44:05 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 24 11:44:05 2015 +0200
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 2 +-
.../log4j/spi/DefaultThreadContextMap.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/597ec4ec/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 98bedc5..a86017f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -68,7 +68,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
/**
* The default MessageFactory class.
*/
- public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS =
+ public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS =
ParameterizedMessageFactory.class;
private static final long serialVersionUID = 2L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/597ec4ec/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 04db82f..33ab304 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -23,15 +23,15 @@ import java.util.Map;
import org.apache.logging.log4j.util.PropertiesUtil;
/**
- * The actual ThreadContext Map. A new ThreadContext Map is created each time it is updated and the Map stored
- * is always immutable. This means the Map can be passed to other threads without concern that it will be updated.
- * Since it is expected that the Map will be passed to many more log events than the number of keys it contains
- * the performance should be much better than if the Map was copied for each event.
+ * The actual ThreadContext Map. A new ThreadContext Map is created each time it is updated and the Map stored is always
+ * immutable. This means the Map can be passed to other threads without concern that it will be updated. Since it is
+ * expected that the Map will be passed to many more log events than the number of keys it contains the performance
+ * should be much better than if the Map was copied for each event.
*/
public class DefaultThreadContextMap implements ThreadContextMap {
- /**
- * Property name ({@value}) for selecting {@code InheritableThreadLocal} (value "true")
- * or plain {@code ThreadLocal} (value is not "true") in the implementation.
+ /**
+ * Property name ({@value} ) for selecting {@code InheritableThreadLocal} (value "true") or plain
+ * {@code ThreadLocal} (value is not "true") in the implementation.
*/
public static final String INHERITABLE_MAP = "isThreadContextMapInheritable";
@@ -42,7 +42,7 @@ public class DefaultThreadContextMap implements ThreadContextMap {
this.useMap = useMap;
this.localMap = createThreadLocalMap(useMap);
}
-
+
// LOG4J2-479: by default, use a plain ThreadLocal, only use InheritableThreadLocal if configured.
// (This method is package protected for JUnit tests.)
static ThreadLocal<Map<String, String>> createThreadLocalMap(final boolean isMapEnabled) {
@@ -53,7 +53,7 @@ public class DefaultThreadContextMap implements ThreadContextMap {
@Override
protected Map<String, String> childValue(final Map<String, String> parentValue) {
return parentValue != null && isMapEnabled //
- ? Collections.unmodifiableMap(new HashMap<>(parentValue)) //
+ ? Collections.unmodifiableMap(new HashMap<>(parentValue)) //
: null;
}
};
@@ -152,7 +152,7 @@ public class DefaultThreadContextMap implements ThreadContextMap {
}
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.localMap.get();
- final Map<String, String> otherMap = other.getImmutableMapOrNull();
+ final Map<String, String> otherMap = other.getImmutableMapOrNull();
if (map == null) {
if (otherMap != null) {
return false;