[jboss-svn-commits] JBoss Common SVN: r3347 - in jboss-logmanager/trunk/src: test/java/org/jboss/logmanager and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-08 21:17:33 -0400 (Wed, 08 Jul 2009)
New Revision: 3347

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/LevelChangingFilter.java
   jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java
Log:
Level change filter should not have a nested filter; instead use any or all to select it

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/LevelChangingFilter.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/LevelChangingFilter.java	2009-07-09 01:05:14 UTC (rev 3346)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/LevelChangingFilter.java	2009-07-09 01:17:33 UTC (rev 3347)
@@ -32,17 +32,14 @@
  */
 public final class LevelChangingFilter implements Filter {
 
-    private final Filter matchFilter;
     private final Level newLevel;
 
     /**
      * Construct a new instance.
      *
-     * @param matchFilter the filter which is checked to see whether the level should be changed
      * @param newLevel the level to change to
      */
-    public LevelChangingFilter(final Filter matchFilter, final Level newLevel) {
-        this.matchFilter = matchFilter;
+    public LevelChangingFilter(final Level newLevel) {
         this.newLevel = newLevel;
     }
 
@@ -53,9 +50,7 @@
      * @return {@code true} always
      */
     public boolean isLoggable(final LogRecord record) {
-        if (matchFilter.isLoggable(record)) {
-            record.setLevel(newLevel);
-        }
+        record.setLevel(newLevel);
         return true;
     }
 }

Modified: jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java
===================================================================
--- jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java	2009-07-09 01:05:14 UTC (rev 3346)
+++ jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java	2009-07-09 01:17:33 UTC (rev 3347)
@@ -244,7 +244,7 @@
     }
 
     public void testLevelChangingFilter0() {
-        final Filter filter = new LevelChangingFilter(AcceptAllFilter.getInstance(), Level.INFO);
+        final Filter filter = new LevelChangingFilter(Level.INFO);
         final AtomicBoolean ran = new AtomicBoolean();
         final Handler handler = new CheckingHandler(ran);
         final Logger logger = Logger.getLogger("filterTest");
@@ -258,7 +258,7 @@
     }
 
     public void testLevelChangingFilter1() {
-        final Filter filter = new LevelChangingFilter(DenyAllFilter.getInstance(), Level.INFO);
+        final Filter filter = new LevelChangingFilter(Level.INFO);
         final AtomicBoolean ran = new AtomicBoolean();
         final Handler handler = new CheckingHandler(ran);
         final Logger logger = Logger.getLogger("filterTest");