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

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

Revision: 3419
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3419&view=rev
Author:   bradtofel
Date:     2011-03-09 05:35:36 +0000 (Wed, 09 Mar 2011)

Log Message:
-----------
BUGFIX: (unreported) wasn't checking for null WaybackRequest that caused a NPE

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java	2011-02-28 23:55:04 UTC (rev 3418)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java	2011-03-09 05:35:36 UTC (rev 3419)
@@ -69,6 +69,9 @@
 
 	protected boolean requestIsImage(HttpServletRequest httpRequest,
 			WaybackRequest wbRequest) {
+		if (wbRequest == null) {
+			return false;
+		}
 		if(wbRequest.isIMGContext()) {
 			return true;
 		}
@@ -81,6 +84,9 @@
 
 	protected boolean requestIsJavascript(HttpServletRequest httpRequest,
 			WaybackRequest wbRequest) {
+		if (wbRequest == null) {
+			return false;
+		}
 		if(wbRequest.isJSContext()) {
 			return true;
 		}
@@ -90,6 +96,9 @@
 
 	protected boolean requestIsCSS(HttpServletRequest httpRequest,
 			WaybackRequest wbRequest) {
+		if (wbRequest == null) {
+			return false;
+		}
 		if(wbRequest.isCSSContext()) {
 			return true;
 		}
@@ -105,7 +114,7 @@
 		httpRequest.setAttribute("exception", exception);
 		UIResults uiResults = new UIResults(wbRequest,uriConverter,exception);
 		boolean handled = false;
-		if(!wbRequest.isReplayRequest()) {
+		if((wbRequest != null) && !wbRequest.isReplayRequest()) {
 
 			if(wbRequest.isXMLMode()) {
 				uiResults.forward(httpRequest, httpResponse, xmlErrorJsp);


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