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

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

Revision: 3416
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3416&view=rev
Author:   bradtofel
Date:     2011-02-09 22:04:47 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
BUGFIX(WWM-36): now only bounces to live web handling for Replay requests

Modified Paths:
--------------
    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/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-02-09 07:03:26 UTC (rev 3415)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-02-09 22:04:47 UTC (rev 3416)
@@ -245,18 +245,15 @@
 			handled = true;
 
 		} catch(WaybackException e) {
-			boolean drawError = true;
-			if(e instanceof ResourceNotInArchiveException) {
-				if((getLiveWebPrefix() != null) 
-						&& (getLiveWebPrefix().length() > 0)) {
+			if((e instanceof ResourceNotInArchiveException) 
+				&& wbRequest.isReplayRequest() 
+				&& (getLiveWebPrefix() != null) 
+				&& (getLiveWebPrefix().length() > 0)) {
 
-					String liveUrl = 
-						getLiveWebPrefix() + wbRequest.getRequestUrl();
-					httpResponse.sendRedirect(liveUrl);
-					drawError = false;
-				}
-			}
-			if(drawError) {
+				String liveUrl = 
+					getLiveWebPrefix() + wbRequest.getRequestUrl();
+						httpResponse.sendRedirect(liveUrl);
+			} else {
 				logNotInArchive(e,wbRequest);
 				getException().renderException(httpRequest, httpResponse, 
 						wbRequest, e, getUriConverter());


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