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

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

Revision: 3620
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3620&view=rev
Author:   ikreymer
Date:     2012-02-28 04:06:57 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
REMOVE: Remove shutdown() from ExclusionFilter, was experimental (since a few builds ago) proved unnecessary

Modified Paths:
--------------
    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/ExclusionFilter.java
    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/resourceindex/filters/CompositeExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java	2012-02-21 20:51:08 UTC (rev 3619)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java	2012-02-28 04:06:57 UTC (rev 3620)
@@ -69,12 +69,4 @@
 		}
 		return FILTER_INCLUDE;
 	}
-	
-	@Override
-	public void shutdown()
-	{
-		for (ExclusionFilter filter : filters) {
-			filter.shutdown();
-		}
-	}
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java	2012-02-21 20:51:08 UTC (rev 3619)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java	2012-02-28 04:06:57 UTC (rev 3620)
@@ -32,9 +32,4 @@
 	public void setFilterGroup(ExclusionCaptureFilterGroup filterGroup) {
 		this.filterGroup = filterGroup;
 	}
-	
-	public void shutdown()
-	{
-		
-	}
 }

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	2012-02-21 20:51:08 UTC (rev 3619)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2012-02-28 04:06:57 UTC (rev 3620)
@@ -190,7 +190,6 @@
 
 		WaybackRequest wbRequest = null;
 		boolean handled = false;
-		ExclusionFilter exclusionFilter = null;
 
 		try {
 			String inputPath = translateRequestPathQuery(httpRequest);
@@ -218,7 +217,7 @@
 				}
 
 				if(getExclusionFactory() != null) {
-					exclusionFilter = 
+					ExclusionFilter exclusionFilter = 
 						getExclusionFactory().get();
 					if(exclusionFilter == null) {
 						throw new AdministrativeAccessControlException(
@@ -278,10 +277,6 @@
 				getException().renderException(httpRequest, httpResponse, 
 						wbRequest, e, getUriConverter());
 			}
-		} finally {
-			if (exclusionFilter != null) {
-				exclusionFilter.shutdown();
-			}
 		}
 		
 		return handled;

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