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 2014/05/20 17:51:51 UTC

svn commit: r1596297 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java

Author: ggregory
Date: Tue May 20 15:51:50 2014
New Revision: 1596297

URL: http://svn.apache.org/r1596297
Log:
Use more precise state management for CompositeFilter.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1596297&r1=1596296&r2=1596297&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Tue May 20 15:51:50 2014
@@ -96,18 +96,20 @@ public final class CompositeFilter exten
 
     @Override
     public void start() {
+        this.setStarting();
         for (final Filter filter : filters) {
             filter.start();
         }
-        super.start();
+        this.setStarted();
     }
 
     @Override
     public void stop() {
+        this.setStopping();
         for (final Filter filter : filters) {
             filter.stop();
         }
-        super.stop();
+        this.setStopped();
     }
 
     /**
@@ -259,9 +261,9 @@ public final class CompositeFilter exten
      */
     @PluginFactory
     public static CompositeFilter createFilters(@PluginElement("Filters") final Filter[] filters) {
-        final List<Filter> f = filters == null || filters.length == 0 ?
+        final List<Filter> filterList = filters == null || filters.length == 0 ?
             new ArrayList<Filter>() : Arrays.asList(filters);
-        return new CompositeFilter(f);
+        return new CompositeFilter(filterList);
     }
 
 }