Repository: logging-log4j2
Updated Branches:
  refs/heads/master 1f27d85de -> c1265b65f


LOG4J2-1590 Fixed issue with filters extending AbstractFilter that did not 
override methods with unrolled varargs.


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

Branch: refs/heads/master
Commit: c1265b65f2d1bc47153823b512bb63eb02c0ec7a
Parents: 1f27d85
Author: rpopma <rpo...@apache.org>
Authored: Sat Sep 17 22:35:57 2016 +0900
Committer: rpopma <rpo...@apache.org>
Committed: Sat Sep 17 22:35:57 2016 +0900

----------------------------------------------------------------------
 .../log4j/core/filter/AbstractFilter.java       | 20 ++++++++++----------
 src/changes/changes.xml                         |  3 +++
 2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c1265b65/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index da53312..a6051ad 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -146,7 +146,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     @Override
     public Result filter(final Logger logger, final Level level, final Marker 
marker, final String msg,
             final Object p0) {
-        return Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0});
     }
 
     /**
@@ -162,7 +162,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     @Override
     public Result filter(final Logger logger, final Level level, final Marker 
marker, final String msg,
             final Object p0, final Object p1) {
-        return Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1});
     }
 
     /**
@@ -179,7 +179,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     @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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2});
     }
 
     /**
@@ -197,7 +197,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     @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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3});
     }
 
     /**
@@ -217,7 +217,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4});
     }
 
     /**
@@ -238,7 +238,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4, p5});
     }
 
     /**
@@ -260,7 +260,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
     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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4, p5, p6});
     }
 
     /**
@@ -284,7 +284,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
             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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4, p5, p6, p7});
     }
 
     /**
@@ -309,7 +309,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
             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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4, p5, p6, p7, p8});
     }
 
     /**
@@ -335,7 +335,7 @@ public abstract class AbstractFilter extends 
AbstractLifeCycle implements Filter
             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 Result.NEUTRAL;
+        return filter(logger, level, marker, msg, new Object[] {p0, p1, p2, 
p3, p4, p5, p6, p7, p8, p9});
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c1265b65/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f1df943..bcc511e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
   </properties>
   <body>
     <release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
+      <action issue="LOG4J2-1590" dev="rpopma" type="fix">
+        Fixed issue with filters extending AbstractFilter that did not 
override methods with unrolled varargs.
+      </action>
       <action issue="LOG4J2-1583" dev="rpopma" type="fix" due-to="Larry West">
         Fixed scrambled log messages triggered by nested logging from 
toString() method of a logging parameter object.
       </action>

Reply via email to