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

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

Revision: 3180
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3180&view=rev
Author:   bradtofel
Date:     2010-07-20 23:52:12 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
TWEAK: somewhat undoing wrapper code, at least allowing it to be optional

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	2010-07-20 23:51:47 UTC (rev 3179)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java	2010-07-20 23:52:12 UTC (rev 3180)
@@ -142,8 +142,13 @@
 			}
 		}
 		if(!handled) {
-			uiResults.forwardWrapped(httpRequest, httpResponse,
-					errorJsp, wbRequest.getAccessPoint().getWrapperJsp());
+			String wrapperJsp = wbRequest.getAccessPoint().getWrapperJsp();
+			if(wrapperJsp != null) {
+				uiResults.forwardWrapped(httpRequest, httpResponse,
+						errorJsp, wrapperJsp);
+			} else {
+				uiResults.forward(httpRequest, httpResponse, errorJsp);
+			}
 		}
 	}
 


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