This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch scheduled-for-deletion/LOG4J2-930 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8b748ca8547095efba7cd7047f76aea42154bafe Author: rpopma <[email protected]> AuthorDate: Mon Jan 12 17:41:21 2015 +0900 delegate #getBytes to Charsets#getBytes --- .../org/apache/logging/log4j/core/layout/AbstractStringLayout.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 89d0604e13..fa4d133ff6 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 @@ -43,8 +43,8 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> { this.charset = charset == null ? Charsets.UTF_8 : charset; } - protected byte[] getBytes(String s) { - return s.getBytes(charset); + protected byte[] getBytes(final String str) { + return Charsets.getBytes(str, charset); } protected Charset getCharset() { @@ -68,6 +68,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> { */ @Override public byte[] toByteArray(final LogEvent event) { - return toSerializable(event).getBytes(charset); + final String str = toSerializable(event); + return getBytes(str); } }
