Remove untested code
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0df5b93f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0df5b93f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0df5b93f Branch: refs/heads/gelf-layout-gc-free Commit: 0df5b93f89c2df02be40ddb2cbddaa0e910e9897 Parents: 20b9009 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Tue Mar 22 12:54:30 2016 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Tue Mar 22 12:54:30 2016 +0100 ---------------------------------------------------------------------- .../log4j/core/layout/AbstractStringLayout.java | 20 +++++--------------- .../logging/log4j/core/layout/GelfLayout.java | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0df5b93f/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java index a31df97..4d1e4c0 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java @@ -77,6 +77,11 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem return result; } + /** + * Returns a {@code TextEncoderHelper} that this Layout implementation can use for encoding log events. + * + * @return a {@code TextEncoderHelper} + */ protected TextEncoderHelper getCachedTextEncoderHelper() { TextEncoderHelper result = textEncoderHelper.get(); if (result == null) { @@ -161,26 +166,11 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem } } - protected byte[] getBytes(final CharSequence cseq) { - if (useCustomEncoding) { // rely on branch prediction to eliminate this check if false - return StringEncoder.encodeSingleByteChars(cseq); - } - ByteBuffer byteBuffer = charset.encode(CharBuffer.wrap(cseq)); - if (byteBuffer.hasArray()) { - return byteBuffer.array(); - } else { - byte[] bytes = new byte[byteBuffer.remaining()]; - byteBuffer.get(bytes); - return bytes; - } - } - @Override public Charset getCharset() { return charset; } - /** * @return The default content type for Strings. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0df5b93f/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index de48431..7942ebb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -144,7 +144,7 @@ public final class GelfLayout extends AbstractStringLayout { @Override public byte[] toByteArray(final LogEvent event) { StringBuilder text = toText(event, getStringBuilder()); - final byte[] bytes = getBytes(text); + final byte[] bytes = getBytes(text.toString()); return compressionType != CompressionType.OFF && bytes.length > compressionThreshold ? compress(bytes) : bytes; }
