alternative way of constructing HTTP request

peacekeeper · Mar 6, 2017 · a1d69f0 · a1d69f0
1 parent 2b73088
commit a1d69f0
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/...http/src/main/java/xdi2/transport/impl/http/impl/servlet/ServletHttpTransportRequest.java b/...http/src/main/java/xdi2/transport/impl/http/impl/servlet/ServletHttpTransportRequest.java
@@ -34,18 +34,30 @@ private ServletHttpTransportRequest(HttpServletRequest httpServletRequest, Strin
 
 	public static ServletHttpTransportRequest fromHttpServletRequest(HttpServletRequest httpServletRequest) {
 
-		// determine request path
-
-		String requestUri = httpServletRequest.getRequestURI();
-		if (log.isDebugEnabled()) log.debug("Request URI: " + requestUri);
+		// determine base path
 
 		String contextPath = httpServletRequest.getContextPath(); 
 		if (contextPath.endsWith("/")) contextPath = contextPath.substring(0, contextPath.length() - 1);
 
 		String servletPath = httpServletRequest.getServletPath();
 		if (servletPath.endsWith("/")) servletPath = servletPath.substring(0, servletPath.length() - 1);
 
-		String requestPath = requestUri.substring(contextPath.length() + servletPath.length());
+		String basePath = contextPath + servletPath;
+		if (basePath.endsWith("/")) basePath = basePath.substring(0, basePath.length() - 1);
+
+		// done
+
+		return fromHttpServletRequest(httpServletRequest, basePath);
+	}
+
+	public static ServletHttpTransportRequest fromHttpServletRequest(HttpServletRequest httpServletRequest, String basePath) {
+
+		// determine request path
+
+		String requestUri = httpServletRequest.getRequestURI();
+		if (log.isDebugEnabled()) log.debug("Request URI: " + requestUri);
+
+		String requestPath = requestUri.substring(basePath.length());
 		if (! requestPath.startsWith("/")) requestPath = "/" + requestPath;
 
 		try {