Repository: logging-log4j2 Updated Branches: refs/heads/master 19418b37d -> 22369ccf0
Fix 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/22369ccf Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/22369ccf Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/22369ccf Branch: refs/heads/master Commit: 22369ccf073f1a27c5ba858f39161194693bda0f Parents: 19418b3 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Thu Oct 20 15:13:48 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Thu Oct 20 15:13:48 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/ContextDataInjector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22369ccf/log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java index 65b9a76..5351245 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java @@ -76,7 +76,7 @@ public interface ContextDataInjector { * ThreadContextDataInjector.copyProperties(properties, reusable); * * // then copy context data key-value pairs (may overwrite configuration properties) - * reusable.addAll(rawContextData()); + * reusable.putAll(rawContextData()); * return reusable; * } * </pre> @@ -102,7 +102,7 @@ public interface ContextDataInjector { * underlying context may or may not be reflected in the returned object, depending on the context data source and * the implementation of this method. It is not safe to pass the returned object to another thread. * </p> - * @return a {@code ReadOnlyStringMap} object reflecting the current state of the context + * @return a {@code ReadOnlyStringMap} object reflecting the current state of the context, may not return {@code null} */ ReadOnlyStringMap rawContextData(); }