You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/11 06:27:53 UTC
[12/50] logging-log4j2 git commit: Merge branch
'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into
LOG4J2-1349-gcfree-threadcontext
Merge branch 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into LOG4J2-1349-gcfree-threadcontext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/463d4846
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/463d4846
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/463d4846
Branch: refs/heads/master
Commit: 463d484622c033e944a7cad1964f92fbb69c1aa9
Parents: 927251f 2a976a9
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 31 00:11:55 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 31 00:11:55 2016 +0900
----------------------------------------------------------------------
.../log4j/core/impl/ContextDataInjector.java | 34 ++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/463d4846/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjector.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjector.java
index e26616d,058ffe1..32b2caa
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjector.java
@@@ -35,13 -33,17 +35,17 @@@ import org.apache.logging.log4j.spi.Mut
* in order to initialize log events with context data from any arbitrary context.
* </p><p>
* When providing a custom {@code ContextDataInjector}, be aware that the {@code ContextDataFactory} may be invoked
- * multiple times by the various components in Log4j that need access to context data.
+ * multiple times and the various components in Log4j that need access to context data may each have their own instance
+ * of {@code ContextDataInjector}.
* This includes the object(s) that populate log events, but also various lookups and filters that look at
* context data to determine whether an event should be logged.
+ * </p><p>
+ * Implementors should take particular note of how the different methods in the interface have different thread-safety
+ * guarantees to enable optimal performance.
* </p>
*
+ * @see ContextData
* @see ContextDataInjectorFactory
- * @see org.apache.logging.log4j.core.ContextData
* @see org.apache.logging.log4j.ThreadContext
* @see ThreadContextDataInjector
* @since 2.7