archive-access-cvs

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

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

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

Log Message:
-----------
test for null pointer before using filterGroup property

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java	2010-04-02 03:19:24 UTC (rev 3018)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java	2010-04-02 03:19:58 UTC (rev 3019)
@@ -90,29 +90,39 @@
 				if(policy.equals(POLICY_ALLOW)) {
 					if(!notifiedAdminSeen) {
 						notifiedAdminSeen = true;
-						filterGroup.setSawAdministrative();
+						if(filterGroup != null) {
+							filterGroup.setSawAdministrative();
+						}
 					}
 					if(!notifiedAdminPassed) {
 						notifiedAdminPassed = true;
-						filterGroup.setPassedAdministrative();
+						if(filterGroup != null) {
+							filterGroup.setPassedAdministrative();
+						}
 					}
 					return FILTER_INCLUDE;
 				} else if(policy.equals(POLICY_BLOCK)) {
 					if(!notifiedAdminSeen) {
 						notifiedAdminSeen = true;
-						filterGroup.setSawAdministrative();
+						if(filterGroup != null) {
+							filterGroup.setSawAdministrative();
+						}
 					}
 					return FILTER_EXCLUDE;
 				} else if(policy.equals(POLICY_ROBOT)) {
 					if(!notifiedRobotSeen) {
 						notifiedRobotSeen = true;
-						filterGroup.setSawRobots();
+						if(filterGroup != null) {
+							filterGroup.setSawRobots();
+						}
 					}
 					return FILTER_INCLUDE;
 //					if(robotFilter != null) {
 //						if(!notifiedRobotPassed) {
 //							notifiedRobotPassed = true;
-//							filterGroup.setPassedRobot();
+//							if(filterGroup != null) {
+//								filterGroup.setPassedRobot();
+//							}
 //						}
 //						return robotFilter.filterObject(o);
 //					} else {


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

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

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

Revision: 3026
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3026&view=rev
Author:   bradtofel
Date:     2010-04-05 23:25:12 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
TWEAK: removed unused imports

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java	2010-04-05 23:24:09 UTC (rev 3025)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java	2010-04-05 23:25:12 UTC (rev 3026)
@@ -32,7 +32,6 @@
 import org.archive.util.ArchiveUtils;
 import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.resourceindex.filters.ExclusionFilter;
-import org.archive.wayback.util.ObjectFilter;
 
 /**
  * @author brad
@@ -46,7 +45,7 @@
 	private final static String POLICY_BLOCK = "block";
 	private final static String POLICY_ROBOT = "robots";
 	private boolean notifiedRobotSeen = false;
-	private boolean notifiedRobotPassed = false;
+//	private boolean notifiedRobotPassed = false;
 	private boolean notifiedAdminSeen = false;
 	private boolean notifiedAdminPassed = false;
 	


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