[Archive-access-cvs] SF.net SVN: archive-access:[3588] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/accesscontrol/ CompositeExclusionFilterFactory.java

[<ikr...@us...>]

Revision: 3588
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3588&view=rev
Author:   ikreymer
Date:     2011-12-21 20:55:11 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
BUGFIX: If any filter factory in the composite list returns a null filter, don't add it to the list
of filters (log as warning)

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java	2011-12-20 23:06:32 UTC (rev 3587)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java	2011-12-21 20:55:11 UTC (rev 3588)
@@ -21,7 +21,9 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
+import org.archive.wayback.accesscontrol.staticmap.StaticMapExclusionFilterFactory;
 import org.archive.wayback.resourceindex.filters.CompositeExclusionFilter;
 import org.archive.wayback.resourceindex.filters.ExclusionFilter;
 
@@ -35,6 +37,9 @@
  */
 public class CompositeExclusionFilterFactory implements ExclusionFilterFactory {
 
+	private static final Logger LOGGER =
+        Logger.getLogger(CompositeExclusionFilterFactory.class.getName());
+	
 	private ArrayList<ExclusionFilterFactory> factories = 
 		new ArrayList<ExclusionFilterFactory>();
 	
@@ -52,7 +57,13 @@
 		Iterator<ExclusionFilterFactory> itr = factories.iterator();
 		CompositeExclusionFilter filter = new CompositeExclusionFilter();
 		while(itr.hasNext()) {
-			filter.addComponent(itr.next().get());
+			ExclusionFilterFactory factory = itr.next();
+			ExclusionFilter filterEntry = factory.get();
+			if (filterEntry != null) {
+				filter.addComponent(filterEntry);
+			} else {
+				LOGGER.warning("Skipping null filter returned from factory: " + factory.getClass().toString());
+			}
 		}
 		return filter;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.