You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/03/08 17:37:24 UTC
[8/8] logging-log4j2 git commit: Merge branch 'master' into
gelf-layout-gc-free
Merge branch 'master' into gelf-layout-gc-free
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/821e6201
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/821e6201
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/821e6201
Branch: refs/heads/gelf-layout-gc-free
Commit: 821e6201d98cec8a6a0bcaa19d09540e1ea4e80b
Parents: 58152b7 cc37ea6
Author: Mikael Ståldal <mi...@magine.com>
Authored: Tue Mar 8 17:37:08 2016 +0100
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Tue Mar 8 17:37:08 2016 +0100
----------------------------------------------------------------------
.../apache/logging/log4j/EventLoggerTest.java | 2 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 3 +--
.../core/pattern/DatePatternConverterTest.java | 2 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../log4j/test/appender/AlwaysFailAppender.java | 11 ++++------
.../log4j/test/appender/DeadlockAppender.java | 13 ++++--------
.../log4j/test/appender/FailOnceAppender.java | 13 ++++--------
.../log4j/test/appender/InMemoryAppender.java | 2 --
.../log4j/test/appender/ListAppender.java | 6 +-----
.../test/appender/UsesLoggingAppender.java | 22 +++++++-------------
10 files changed, 24 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821e6201/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
----------------------------------------------------------------------
diff --cc log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
index cd9ec82,125f3d8..97ca15d
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
@@@ -44,11 -41,9 +44,9 @@@ import org.apache.logging.log4j.core.la
@Plugin(name = "List", category = "Core", elementType = "appender", printObject = true)
public class ListAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
// Use CopyOnWriteArrayList?
- private final List<LogEvent> events = new ArrayList<>();
+ final List<LogEvent> events = new ArrayList<>();
private final List<String> messages = new ArrayList<>();