Repository: logging-log4j2 Updated Branches: refs/heads/master 3c2aef1ce -> a22b7ae64
LOG4J2-1611 LOG4J2-1010 ThreadContextDataInjector.ForDefaultThreadContextMap javadoc. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a22b7ae6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a22b7ae6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a22b7ae6 Branch: refs/heads/master Commit: a22b7ae647be633646159d3259c175200baaace1 Parents: 3c2aef1 Author: rpopma <rpo...@apache.org> Authored: Sat Sep 24 00:57:19 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Sat Sep 24 00:57:19 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/impl/ThreadContextDataInjector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a22b7ae6/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 54fc06f..698d53a 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 @@ -62,11 +62,11 @@ public class ThreadContextDataInjector { * specified reusable StringMap. * * @param props list of configuration properties, may be {@code null} - * @param reusable a {@code StringMap} instance that may be reused to avoid creating temporary objects + * @param ignore a {@code StringMap} instance from the log event * @return a {@code StringMap} combining configuration properties with thread context data */ @Override - public StringMap injectContextData(final List<Property> props, final StringMap reusable) { + public StringMap injectContextData(final List<Property> props, final StringMap ignore) { final Map<String, String> copy = ThreadContext.getImmutableContext();