You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/01/12 09:53:11 UTC
[14/18] logging-log4j2 git commit: delegate #getBytes to
Charsets#getBytes
delegate #getBytes to Charsets#getBytes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b748ca8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b748ca8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b748ca8
Branch: refs/heads/LOG4J2-930
Commit: 8b748ca8547095efba7cd7047f76aea42154bafe
Parents: 36a5bb1
Author: rpopma <rp...@apache.org>
Authored: Mon Jan 12 17:41:21 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Jan 12 17:41:21 2015 +0900
----------------------------------------------------------------------
.../logging/log4j/core/layout/AbstractStringLayout.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b748ca8/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 89d0604..fa4d133 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);
}
}