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

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

Revision: 3089
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3089&view=rev
Author:   bradtofel
Date:     2010-05-07 23:11:24 +0000 (Fri, 07 May 2010)

Log Message:
-----------
BUGFIX: was setting path prefix to "//" for requests to "/"

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestMapper.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestMapper.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestMapper.java	2010-05-07 23:10:16 UTC (rev 3088)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestMapper.java	2010-05-07 23:11:24 UTC (rev 3089)
@@ -148,7 +148,7 @@
 		portMapper.addRequestHandler(host, path, requestHandler);
 	}
 
-	private RequestHandlerContext mapRequest(HttpServletRequest request) {
+	public RequestHandlerContext mapRequest(HttpServletRequest request) {
 		RequestHandlerContext handlerContext = null;
 		
 		int port = request.getLocalPort();
@@ -181,8 +181,12 @@
 			if(handlerContext != null) {
 				RequestHandler requestHandler = 
 					handlerContext.getRequestHandler();
-				request.setAttribute(REQUEST_CONTEXT_PREFIX, 
-						handlerContext.getPathPrefix() + "/");
+				// need to add trailing "/" iff prefix is not "/":
+				String pathPrefix = handlerContext.getPathPrefix();
+				if(!pathPrefix.equals("/")) {
+					pathPrefix += "/";
+				}
+				request.setAttribute(REQUEST_CONTEXT_PREFIX,pathPrefix); 
 				handled = requestHandler.handleRequest(request, response);
 			}
 		}


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