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/08/27 06:56:10 UTC

[41/42] logging-log4j2 git commit: LOG4J2-1010 DynamicThresholdFilter should get context data from the configured ContextDataInjector, not hard-coded from ThreadContext

LOG4J2-1010 DynamicThresholdFilter should get context data from the configured ContextDataInjector, not hard-coded from ThreadContext


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

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 07f3fad7f2c461ac583be9bb233beeae4bd394d2
Parents: 498bdb5
Author: rpopma <rp...@apache.org>
Authored: Sat Aug 27 15:52:12 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Aug 27 15:52:12 2016 +0900

----------------------------------------------------------------------
 .../core/filter/DynamicThresholdFilter.java     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/07f3fad7/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index eaa999c..d6146d7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -169,28 +169,28 @@ public final class DynamicThresholdFilter extends AbstractFilter {
     @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
     @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
     @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1, final Object p2) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
     @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1, final Object p2, final Object p3) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -198,7 +198,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -206,7 +206,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4, final Object p5) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -214,7 +214,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4, final Object p5, final Object p6) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -223,7 +223,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4, final Object p5, final Object p6,
             final Object p7) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -232,7 +232,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4, final Object p5, final Object p6,
             final Object p7, final Object p8) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }
 
@@ -241,7 +241,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
             final Object p0, final Object p1, final Object p2, final Object p3,
             final Object p4, final Object p5, final Object p6,
             final Object p7, final Object p8, final Object p9) {
-        return filter(level, ThreadContext.getContext());
+        return filter(level, currentContextData());
 
     }