Merge remote-tracking branch 'remotes/origin/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/13e51b26 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/13e51b26 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/13e51b26 Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 13e51b2681ab40d45ec09f44a206576868a29d3c Parents: b5e9a17 e5a3b9e Author: rpopma <[email protected]> Authored: Tue Aug 23 22:42:02 2016 +0900 Committer: rpopma <[email protected]> Committed: Tue Aug 23 22:42:02 2016 +0900 ---------------------------------------------------------------------- .../log4j/spi/DefaultThreadContextMap.java | 2 +- .../logging/log4j/spi/ThreadContextMap2.java | 2 +- .../logging/log4j/core/LoggerContext.java | 26 ++-- .../core/appender/rolling/TriggeringPolicy.java | 2 +- .../core/config/AbstractConfiguration.java | 1 + .../log4j/core/config/AppenderControl.java | 3 +- .../logging/log4j/core/config/LoggerConfig.java | 36 +---- .../config/plugins/PluginBuilderFactory.java | 1 + .../config/plugins/PluginConfiguration.java | 1 + .../core/config/plugins/PluginFactory.java | 2 +- .../log4j/core/config/plugins/PluginNode.java | 1 + .../core/config/plugins/util/PluginBuilder.java | 2 - .../config/plugins/util/PluginRegistry.java | 1 - .../log4j/core/config/xml/XmlConfiguration.java | 40 +++--- .../log4j/core/script/ScriptManager.java | 1 - .../core/selector/BasicContextSelector.java | 131 ++++++++++--------- .../apache/logging/log4j/core/util/Assert.java | 38 ------ .../logging/log4j/core/util/Constants.java | 11 -- .../org/apache/logging/slf4j/MDCContextMap.java | 2 +- .../org/apache/logging/log4j/web/WebLookup.java | 8 -- src/changes/changes.xml | 9 ++ 21 files changed, 123 insertions(+), 197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/13e51b26/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java ----------------------------------------------------------------------
