You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/10/13 06:09:29 UTC

[33/50] logging-log4j2 git commit: LOG4J2-935: document reason for this logic in comments

LOG4J2-935: document reason for this logic in comments


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2b967424
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2b967424
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2b967424

Branch: refs/heads/master
Commit: 2b967424f6fdb04894b9cb7af51aa171bee33522
Parents: 6630dd7
Author: rpopma <rp...@apache.org>
Authored: Mon Oct 5 02:00:43 2015 +0200
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Oct 11 12:40:43 2015 -0700

----------------------------------------------------------------------
 .../apache/logging/log4j/core/layout/AbstractStringLayout.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b967424/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 3a5d39b..de73e27 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
@@ -63,7 +63,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
     static byte[] toBytes(final String str, final Charset charset) {
         if (str != null) {
             final Charset actual = charset != null ? charset : Charset.defaultCharset();
-            try {
+            try { // LOG4J2-935: String.getBytes(String) gives better performance
                 return str.getBytes(actual.name());
             } catch (UnsupportedEncodingException e) {
                 return str.getBytes(actual);
@@ -88,7 +88,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
     }
 
     protected byte[] getBytes(final String s) {
-        try {
+        try { // LOG4J2-935: String.getBytes(String) gives better performance
             return s.getBytes(charsetName);
         } catch (UnsupportedEncodingException e) {
             return s.getBytes(charset);