You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/22 09:47:37 UTC

logging-log4j2 git commit: Refactor for reuse.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 32ebd4bee -> d1d586f8a


Refactor for reuse.

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

Branch: refs/heads/master
Commit: d1d586f8affdb076de2fd0835b5e54ab07b4e7cc
Parents: 32ebd4b
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 22 00:47:34 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 22 00:47:34 2015 -0700

----------------------------------------------------------------------
 .../apache/logging/log4j/core/layout/AbstractStringLayout.java | 6 ++++++
 .../org/apache/logging/log4j/core/layout/PatternLayout.java    | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d1d586f8/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 395d717..5fcc6f6 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
@@ -54,6 +54,12 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
         };
     }
 
+    protected static StringBuilder prepareStringBuilder(ThreadLocal<StringBuilder> threadLocal) {
+        final StringBuilder buf = threadLocal.get();
+        buf.setLength(0);
+        return buf;
+    }
+
     /**
      * The charset for the formatted message.
      */

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d1d586f8/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index e0f8fad..44f4d17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -191,8 +191,7 @@ public final class PatternLayout extends AbstractStringLayout {
      */
     @Override
     public String toSerializable(final LogEvent event) {
-        final StringBuilder buf = strBuilder.get();
-        buf.setLength(0);
+        final StringBuilder buf = prepareStringBuilder(strBuilder);
         final int len = formatters.length;
         for (int i = 0; i < len; i++) {
             formatters[i].format(event, buf);