LOG4J2-1010 renamed ThreadContextDataInjector inner implementation classes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/00670661 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/00670661 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/00670661 Branch: refs/heads/master Commit: 0067066157412a00621fdb87ff853ba91809ce18 Parents: 281ad99 Author: rpopma <rpo...@apache.org> Authored: Fri Sep 23 17:50:28 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Fri Sep 23 17:50:28 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/impl/ContextDataInjectorFactory.java | 4 ++-- .../logging/log4j/core/impl/ThreadContextDataInjector.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/00670661/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java index 4dcacbc..b0a6023 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java @@ -82,10 +82,10 @@ public class ContextDataInjectorFactory { private static ContextDataInjector createDefaultInjector() { final ThreadContextMap threadContextMap = ThreadContextAccess.getThreadContextMap(); if (threadContextMap instanceof CopyOnWrite && threadContextMap instanceof ThreadContextMap2) { - return new ThreadContextDataInjector.ForCopyOnWriteMutableThreadContextMap(); + return new ThreadContextDataInjector.ForCopyOnWriteThreadContextMap(); } if (threadContextMap instanceof ThreadContextMap2) { - return new ThreadContextDataInjector.ForGarbageFreeMutableThreadContextMap(); + return new ThreadContextDataInjector.ForGarbageFreeThreadContextMap(); } return new ThreadContextDataInjector.ForDefaultThreadContextMap(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/00670661/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java index 92144c4..9920c06 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java @@ -102,7 +102,7 @@ public class ThreadContextDataInjector { * <p> * This injector always puts key-value pairs into the specified reusable StringMap. */ - public static class ForGarbageFreeMutableThreadContextMap implements ContextDataInjector { + public static class ForGarbageFreeThreadContextMap implements ContextDataInjector { /** * Puts key-value pairs from both the specified list of properties as well as the thread context into the * specified reusable StringMap. @@ -137,7 +137,7 @@ public class ThreadContextDataInjector { * structure. Otherwise the configuration properties are combined with the thread context key-value pairs into the * specified reusable StringMap. */ - public static class ForCopyOnWriteMutableThreadContextMap implements ContextDataInjector { + public static class ForCopyOnWriteThreadContextMap implements ContextDataInjector { /** * If there are no configuration properties, this injector will return the thread context's internal data * structure. Otherwise the configuration properties are combined with the thread context key-value pairs into the
