Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cbe0e5d3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cbe0e5d3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cbe0e5d3 Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: cbe0e5d34c0b2d2288a71315b05ff6c14dbcb4c4 Parents: e45e82f a315824 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Wed Jun 29 11:00:48 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Wed Jun 29 11:00:48 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/Logger.java | 25 ++- .../core/filter/DynamicThresholdFilter.java | 2 +- .../core/pattern/MessagePatternConverter.java | 2 +- .../log4j/core/appender/FileAppenderTest.java | 6 +- .../rolling/OnStartupTriggeringPolicyTest.java | 28 ++-- .../RandomRollingAppenderOnStartupTest.java | 17 +- .../rolling/RollingAppenderCronTest.java | 57 +++---- .../RollingAppenderCustomDeleteActionTest.java | 28 +--- ...lingAppenderDeleteAccumulatedCount1Test.java | 29 +--- ...lingAppenderDeleteAccumulatedCount2Test.java | 29 +--- ...ollingAppenderDeleteAccumulatedSizeTest.java | 28 +--- .../RollingAppenderDeleteMaxDepthTest.java | 28 +--- .../RollingAppenderDeleteNestedTest.java | 29 +--- .../RollingAppenderDeleteScriptFri13thTest.java | 29 +--- .../RollingAppenderDeleteScriptTest.java | 27 +--- ...ollingAppenderNoUnconditionalDeleteTest.java | 6 +- .../rolling/RollingAppenderOnStartupTest.java | 15 +- .../rolling/RollingAppenderSizeTest.java | 36 +---- .../rolling/RollingAppenderTimeAndSizeTest.java | 29 +--- .../rolling/RollingAppenderTimeTest.java | 36 ++--- .../RollingAppenderUncompressedTest.java | 28 ++-- ...RandomAccessFileManagerHeaderFooterTest.java | 29 +--- .../RollingRandomAccessFileManagerTest.java | 155 +++++++++---------- .../routing/JsonRoutingAppender2Test.java | 16 +- .../routing/JsonRoutingAppenderTest.java | 16 +- .../routing/PropertiesRoutingAppenderTest.java | 23 ++- .../appender/routing/RoutingAppenderTest.java | 11 +- .../routing/RoutingAppenderWithJndiTest.java | 6 +- .../routing/RoutingAppenderWithPurgingTest.java | 21 +-- .../routing/RoutingDefaultAppenderTest.java | 16 +- .../junit/AbstractExternalFileCleaner.java | 81 ++++++++++ .../apache/logging/log4j/junit/CleanFiles.java | 56 +++---- .../logging/log4j/junit/CleanFolders.java | 90 ++++++----- .../logging/log4j/junit/LoggerContextRule.java | 93 +++++++---- 34 files changed, 495 insertions(+), 632 deletions(-) ----------------------------------------------------------------------