Repository: logging-log4j2 Updated Branches: refs/heads/master cc71a2576 -> ddbd6aef2
Follow source code style guide. [LOG4J2-2212] Unnecessary contention in CopyOnWriteSortedArrayThreadContextMap. [LOG4J2-2213] Unnecessary contention in GarbageFreeSortedArrayThreadContextMap. Oops, forgot to remove old call. [LOG4J2-2214] Unnecessary contention in DefaultThreadContextMap. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ddbd6aef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ddbd6aef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ddbd6aef Branch: refs/heads/master Commit: ddbd6aef23b1b1a39783e9ba2cc74b73a9e9c46e Parents: cc71a25 Author: Gary Gregory <[email protected]> Authored: Tue Jan 23 15:51:28 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Tue Jan 23 15:51:28 2018 -0700 ---------------------------------------------------------------------- .../spi/CopyOnWriteSortedArrayThreadContextMap.java | 12 ++++++------ .../logging/log4j/spi/DefaultThreadContextMap.java | 6 +++--- .../spi/GarbageFreeSortedArrayThreadContextMap.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ddbd6aef/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java index fd94566..9ba4221 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java @@ -54,8 +54,8 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap private static final StringMap EMPTY_CONTEXT_DATA = new SortedArrayStringMap(1); - private static volatile int InitialCapacity; - private static volatile boolean InheritableMap; + private static volatile int initialCapacity; + private static volatile boolean inheritableMap; /** * Initializes static variables based on system properties. Normally called when this class is initialized by the VM @@ -63,8 +63,8 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap */ static void init() { final PropertiesUtil properties = PropertiesUtil.getProperties(); - InitialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); - InheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); + initialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); + inheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); } static { @@ -81,7 +81,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap // LOG4J2-479: by default, use a plain ThreadLocal, only use InheritableThreadLocal if configured. // (This method is package protected for JUnit tests.) private ThreadLocal<StringMap> createThreadLocalMap() { - if (InheritableMap) { + if (inheritableMap) { return new InheritableThreadLocal<StringMap>() { @Override protected StringMap childValue(final StringMap parentValue) { @@ -106,7 +106,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap * @return an implementation of the {@code StringMap} used to back this thread context map */ protected StringMap createStringMap() { - return new SortedArrayStringMap(InitialCapacity); + return new SortedArrayStringMap(initialCapacity); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ddbd6aef/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 9f4c351..c3af1a5 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 @@ -42,7 +42,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString private final boolean useMap; private final ThreadLocal<Map<String, String>> localMap; - private static boolean InheritableMap; + private static boolean inheritableMap; static { init(); @@ -51,7 +51,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString // 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) { - if (InheritableMap) { + if (inheritableMap) { return new InheritableThreadLocal<Map<String, String>>() { @Override protected Map<String, String> childValue(final Map<String, String> parentValue) { @@ -66,7 +66,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString } static void init() { - InheritableMap = PropertiesUtil.getProperties().getBooleanProperty(INHERITABLE_MAP); + inheritableMap = PropertiesUtil.getProperties().getBooleanProperty(INHERITABLE_MAP); } public DefaultThreadContextMap() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ddbd6aef/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java index 576b306..c9cbd63 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java @@ -54,8 +54,8 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap protected final ThreadLocal<StringMap> localMap; - private static volatile int InitialCapacity; - private static volatile boolean InheritableMap; + private static volatile int initialCapacity; + private static volatile boolean inheritableMap; /** * Initializes static variables based on system properties. Normally called when this class is initialized by the VM @@ -63,8 +63,8 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap */ static void init() { final PropertiesUtil properties = PropertiesUtil.getProperties(); - InitialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); - InheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); + initialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); + inheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); } static { @@ -78,7 +78,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap // LOG4J2-479: by default, use a plain ThreadLocal, only use InheritableThreadLocal if configured. // (This method is package protected for JUnit tests.) private ThreadLocal<StringMap> createThreadLocalMap() { - if (InheritableMap) { + if (inheritableMap) { return new InheritableThreadLocal<StringMap>() { @Override protected StringMap childValue(final StringMap parentValue) { @@ -98,7 +98,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap * @return an implementation of the {@code StringMap} used to back this thread context map */ protected StringMap createStringMap() { - return new SortedArrayStringMap(InitialCapacity); + return new SortedArrayStringMap(initialCapacity); } /**
