Use default values in ctor. - Fall back to Logger.getLevel() for null Level. - Fall back to Charset.defaultCharset() for null Charset. - Inline ByteBufferInputStream instance.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/657e5d53 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/657e5d53 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/657e5d53 Branch: refs/heads/master Commit: 657e5d5394f3d0a9aea3635753d090a4f650cc8a Parents: c00b704 Author: Matt Sicker <[email protected]> Authored: Thu Sep 4 11:22:36 2014 -0500 Committer: Matt Sicker <[email protected]> Committed: Thu Sep 4 11:56:49 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/io/ByteStreamLogger.java | 8 +++----- .../java/org/apache/logging/log4j/io/CharStreamLogger.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/657e5d53/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java ---------------------------------------------------------------------- diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java index 42c4c63..8d3b3e3 100644 --- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java +++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java @@ -58,7 +58,6 @@ public class ByteStreamLogger { private final ExtendedLogger logger; private final Level level; private final Marker marker; - private final ByteBufferInputStream inputStream; private final InputStreamReader reader; private final char[] msgBuf = new char[BUFFER_SIZE]; private final StringBuilder msg = new StringBuilder(); @@ -68,17 +67,16 @@ public class ByteStreamLogger { public ByteStreamLogger(final ExtendedLogger logger, final Level level, final Marker marker, final Charset charset) { this.logger = logger; - this.level = level; + this.level = level == null ? logger.getLevel() : level; this.marker = marker; - this.inputStream = new ByteBufferInputStream(); - this.reader = new InputStreamReader(this.inputStream, charset); + this.reader = new InputStreamReader(new ByteBufferInputStream(), + charset == null ? Charset.defaultCharset() : charset); } public void close(final String fqcn) { synchronized (this.msg) { this.closed = true; logEnd(fqcn); -// in.close(); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/657e5d53/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java ---------------------------------------------------------------------- diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java index f3977d8..cd7d92e 100644 --- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java +++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java @@ -32,7 +32,7 @@ public class CharStreamLogger { public CharStreamLogger(final ExtendedLogger logger, final Level level, final Marker marker) { this.logger = logger; - this.level = level; + this.level = level == null ? logger.getLevel() : level; this.marker = marker; }
