[Archive-access-cvs] SF.net SVN: archive-access:[2984] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ CompositeExclusionFilter.java

[<bra...@us...>]

Revision: 2984
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2984&view=rev
Author:   bradtofel
Date:     2010-03-20 00:58:14 +0000 (Sat, 20 Mar 2010)

Log Message:
-----------
BUGFIX(unreported): checks that filters are not null, which likely indicates a situation where no results can be returned anyways.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java	2010-03-19 21:18:47 UTC (rev 2983)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java	2010-03-20 00:58:14 UTC (rev 2984)
@@ -55,7 +55,11 @@
 	public int filterObject(CaptureSearchResult r) {
 		Iterator<ObjectFilter<CaptureSearchResult>> itr = filters.iterator();
 		while(itr.hasNext()) {
-			int result = itr.next().filterObject(r);
+			ObjectFilter<CaptureSearchResult> filter = itr.next();
+			if(filter == null) {
+				return FILTER_EXCLUDE;
+			}
+			int result = filter.filterObject(r);
 			if(result != FILTER_INCLUDE) {
 				return result;
 			}


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