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

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

Revision: 3017
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3017&view=rev
Author:   bradtofel
Date:     2010-04-02 03:18:34 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
BUGFIX: now definitely causes a complete failure of resourceIndex queries when the adminstrative exclusion file is missing.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2010-04-02 03:16:47 UTC (rev 3016)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2010-04-02 03:18:34 UTC (rev 3017)
@@ -81,7 +81,9 @@
 	 */
 	public int filterObject(CaptureSearchResult r) {
 		if(!notifiedSeen) { 
-			filterGroup.setSawAdministrative();
+			if(filterGroup != null) {
+				filterGroup.setSawAdministrative();
+			}
 			notifiedSeen = true;
 		}
 		String url = r.getOriginalUrl();
@@ -102,7 +104,9 @@
 			return ObjectFilter.FILTER_EXCLUDE;
 		} else {
 			if(!notifiedPassed) {
-				filterGroup.setPassedAdministrative();
+				if(filterGroup != null) {
+					filterGroup.setPassedAdministrative();
+				}
 				notifiedPassed = true;
 			}
 			return ObjectFilter.FILTER_INCLUDE;

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2010-04-02 03:16:47 UTC (rev 3016)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2010-04-02 03:18:34 UTC (rev 3017)
@@ -73,6 +73,9 @@
 	protected void reloadFile() throws IOException {
 		long currentMod = file.lastModified();
 		if(currentMod == lastUpdated) {
+			if(currentMod == 0) {
+				LOGGER.error("No exclude file at " + file.getAbsolutePath());
+			}
 			return;
 		}
 		LOGGER.info("Reloading exclusion file " + file.getAbsolutePath());


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