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 2016/04/10 12:34:27 UTC

logging-log4j2 git commit: LOG4J2-1291 removed check for Constants.ENABLE_THREADLOCALS since AbstractStringLayout no longer uses a ThreadLocal

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 412721f9d -> b8e89c0fc


LOG4J2-1291 removed check for Constants.ENABLE_THREADLOCALS since AbstractStringLayout no longer uses a ThreadLocal<TextEncoderHelper>


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

Branch: refs/heads/master
Commit: b8e89c0fca191c72905f781608bb2684b1fb0858
Parents: 412721f
Author: rpopma <rp...@apache.org>
Authored: Sun Apr 10 19:34:25 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Apr 10 19:34:25 2016 +0900

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/core/layout/PatternLayout.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b8e89c0f/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 e35e358..ce04f52 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
@@ -174,7 +174,7 @@ public final class PatternLayout extends AbstractStringLayout {
 
     @Override
     public void encode(final LogEvent event, final ByteBufferDestination destination) {
-        if (!Constants.ENABLE_THREADLOCALS || !(eventSerializer instanceof Serializer2)) {
+        if (!(eventSerializer instanceof Serializer2)) {
             super.encode(event, destination);
             return;
         }