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

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

Revision: 3624
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3624&view=rev
Author:   ikreymer
Date:     2012-03-01 08:47:49 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
BUGFIX: Fix a NPE due to null filterGroups

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java	2012-02-29 22:37:07 UTC (rev 3623)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java	2012-03-01 08:47:49 UTC (rev 3624)
@@ -207,11 +207,15 @@
 					return null;
 				} catch (LiveWebCacheUnavailableException e) {
 					LOGGER.severe("ROBOT: LiveWebCacheUnavailableException("+urlString+")");
-					filterGroup.setLiveWebGone();
+					if (filterGroup != null) {
+						filterGroup.setLiveWebGone();
+					}
 					return null;
 				} catch (LiveWebTimeoutException e) {
 					LOGGER.severe("ROBOT: LiveDocumentTimedOutException("+urlString+")");
-					filterGroup.setRobotTimedOut();
+					if (filterGroup != null) {
+						filterGroup.setRobotTimedOut();
+					}
 					return null;
 				} finally {
 					long elapsed = System.currentTimeMillis() - start;
@@ -252,7 +256,7 @@
 		int filterResult = ObjectFilter.FILTER_EXCLUDE; 
 		RobotRules rules = getRules(r);
 		if(rules == null) {
-			if(filterGroup.getRobotTimedOut() || filterGroup.getLiveWebGone()) {
+			if((filterGroup == null) || (filterGroup.getRobotTimedOut() || filterGroup.getLiveWebGone())) {
 				return ObjectFilter.FILTER_ABORT;
 			}
 		} else {

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