Merge branch 'master' into LOG4J2-1395
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/22313da8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/22313da8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/22313da8 Branch: refs/heads/LOG4J2-1395 Commit: 22313da8c948f134d8325f51ff7139c2dce585de Parents: 504a0e6 021da77 Author: Mikael Ståldal <[email protected]> Authored: Mon Jun 13 11:31:18 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Mon Jun 13 11:31:18 2016 +0200 ---------------------------------------------------------------------- BUILDING.txt | 2 +- .../java/org/apache/logging/log4j/Logger.java | 14 ++- .../log4j/message/ParameterFormatter.java | 21 ++++ .../logging/log4j/spi/AbstractLogger.java | 26 +---- .../apache/logging/log4j/util/Constants.java | 61 ++++++++++ .../apache/logging/log4j/util/LoaderUtil.java | 1 + .../org/apache/logging/log4j/util/Unbox.java | 46 +++++++- .../log4j/core/appender/AsyncAppender.java | 3 + .../core/appender/RollingFileAppender.java | 2 + .../RollingRandomAccessFileAppender.java | 2 + .../appender/rolling/RollingFileManager.java | 3 + .../rolling/RollingRandomAccessFileManager.java | 6 +- .../logging/log4j/core/util/Constants.java | 6 +- .../AsyncAppenderQueueFullPolicyTest.java | 29 +++-- .../rolling/OnStartupTriggeringPolicyTest.java | 1 + .../RandomRollingAppenderOnStartupTest.java | 110 +++++++++++++++++++ .../rolling/RollingAppenderOnStartupTest.java | 21 +++- .../rolling/RollingAppenderSizeTest.java | 35 +++++- .../log4j/test/appender/BlockingAppender.java | 1 + log4j-core/src/test/resources/log4j-test5.xml | 36 ++++++ .../logging/log4j/perf/jmh/UnboxBenchmark.java | 91 +++++++++++++++ pom.xml | 3 +- src/changes/changes.xml | 23 ++++ src/site/xdoc/articles.xml | 4 + src/site/xdoc/manual/extending.xml | 10 +- 25 files changed, 493 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
