Merge remote-tracking branch 'origin/LOG4J2-1553' Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/090aca8f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/090aca8f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/090aca8f
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 090aca8fb841007c72d354d69efed339bb949cd0 Parents: 379b6ea 8bc6922 Author: ggregory <ggreg...@apache.org> Authored: Wed Aug 31 10:40:25 2016 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Wed Aug 31 10:40:25 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/AbstractManager.java | 41 ++- .../appender/AbstractOutputStreamAppender.java | 2 +- .../core/appender/AbstractWriterAppender.java | 2 +- .../core/appender/MemoryMappedFileManager.java | 2 +- .../core/appender/OutputStreamManager.java | 4 +- .../core/appender/RandomAccessFileManager.java | 2 +- .../log4j/core/appender/WriterManager.java | 4 +- .../appender/db/AbstractDatabaseAppender.java | 4 +- .../appender/db/AbstractDatabaseManager.java | 2 +- .../log4j/core/appender/mom/JmsAppender.java | 2 +- .../log4j/core/appender/mom/JmsManager.java | 2 +- .../appender/mom/jeromq/JeroMqAppender.java | 362 +++++++++---------- .../core/appender/mom/kafka/KafkaAppender.java | 2 +- .../appender/rolling/RollingFileManager.java | 2 +- .../rolling/RollingRandomAccessFileManager.java | 2 +- .../logging/log4j/core/lookup/JndiLookup.java | 2 +- .../log4j/core/net/TcpSocketManager.java | 4 +- .../log4j/core/net/server/JmsServer.java | 2 +- .../core/selector/JndiContextSelector.java | 2 +- .../appender/MemoryMappedFileManagerTest.java | 25 +- .../db/AbstractDatabaseAppenderTest.java | 10 +- .../db/jdbc/AbstractJdbcAppenderTest.java | 2 +- .../db/jpa/AbstractJpaAppenderTest.java | 2 +- .../log4j/core/appender/mom/JmsAppenderIT.java | 2 +- .../rolling/OnStartupTriggeringPolicyTest.java | 7 +- .../log4j/flume/appender/FlumeAppender.java | 2 +- .../appender/NoSqlDatabaseManagerTest.java | 81 ++--- .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 4 +- .../log4j/perf/jmh/JpaAppenderBenchmark.java | 4 +- 29 files changed, 291 insertions(+), 293 deletions(-) ----------------------------------------------------------------------
