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/08/23 13:42:40 UTC

[22/23] logging-log4j2 git commit: Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure

Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e5a3b9e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e5a3b9e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e5a3b9e1

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: e5a3b9e1ce8c660631c85ad4e501ad2bf9f7fbe8
Parents: 88d2066 6ad8fca
Author: rpopma <rp...@apache.org>
Authored: Tue Aug 23 22:40:26 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Aug 23 22:40:26 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(-)
----------------------------------------------------------------------