Repository: logging-log4j2 Updated Branches: refs/heads/master bb220a0cb -> 42da9595b
LOG4J2-1010 even better javadoc for LogEvent::getContextData Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/42da9595 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/42da9595 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/42da9595 Branch: refs/heads/master Commit: 42da9595b9cafbba3c7e033d66ab49cc6f1c5aa5 Parents: bb220a0 Author: rpopma <rpo...@apache.org> Authored: Fri Sep 23 17:18:39 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Fri Sep 23 17:18:39 2016 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/core/LogEvent.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42da9595/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java index 677e9e7..1b608b9 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java @@ -61,9 +61,10 @@ public interface LogEvent extends Serializable { * Returns the {@code ReadOnlyStringMap} object holding context data key-value pairs. * <p> * Context data (also known as Mapped Diagnostic Context or MDC) is data that is set by the application to be - * included in all subsequent log events. The default source for context data is the {@link ThreadContext}, - * but users can configure a custom {@link ContextDataInjector} to obtain key-value pairs from any arbitrary - * source. + * included in all subsequent log events. The default source for context data is the {@link ThreadContext} (and + * <a href="https://logging.apache.org/log4j/2.x/manual/configuration.html#PropertySubstitution">properties</a> + * configured on the Logger that logged the event), but users can configure a custom {@link ContextDataInjector} + * to inject key-value pairs from any arbitrary source. * * @return the {@code ReadOnlyStringMap} object holding context data key-value pairs * @see ContextDataInjector