[Archive-access-cvs] SF.net SVN: archive-access:[3021] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

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

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

Log Message:
-----------
BUGFIX(unreported) now definitely throws an AdministrativeExclusionException if the ExclusionFilterFactory returns null, and also attents to shutdown() the ExclusionFilterFactory, if configured.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2010-04-02 03:28:28 UTC (rev 3020)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2010-04-02 03:30:31 UTC (rev 3021)
@@ -49,12 +49,14 @@
 import org.archive.wayback.core.UIResults;
 import org.archive.wayback.core.UrlSearchResults;
 import org.archive.wayback.core.WaybackRequest;
+import org.archive.wayback.exception.AdministrativeAccessControlException;
 import org.archive.wayback.exception.AuthenticationControlException;
 import org.archive.wayback.exception.BaseExceptionRenderer;
 import org.archive.wayback.exception.BetterRequestException;
 import org.archive.wayback.exception.ResourceNotAvailableException;
 import org.archive.wayback.exception.ResourceNotInArchiveException;
 import org.archive.wayback.exception.WaybackException;
+import org.archive.wayback.resourceindex.filters.ExclusionFilter;
 import org.archive.wayback.util.operator.BooleanOperator;
 import org.springframework.beans.factory.BeanNameAware;
 
@@ -385,7 +387,12 @@
 				}
 
 				if(exclusionFactory != null) {
-					wbRequest.setExclusionFilter(exclusionFactory.get());
+					ExclusionFilter exclusionFilter = exclusionFactory.get();
+					if(exclusionFilter == null) {
+						throw new AdministrativeAccessControlException(
+								"AccessControl list unavailable");
+					}
+					wbRequest.setExclusionFilter(exclusionFilter);
 				}
 				// TODO: refactor this into RequestParser implementations, so a
 				// user could alter requests to change the behavior within a
@@ -483,6 +490,9 @@
 		if(collection != null) {
 			collection.shutdown();
 		}
+		if(exclusionFactory != null) {
+			exclusionFactory.shutdown();
+		}
 	}
 	
 	private void logNotInArchive(WaybackException e, WaybackRequest r) {


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