Fix filter handling for includes and forwards
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1691990 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
index 9a97cef..b654d8f 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
@@ -68,7 +68,7 @@
DispatcherType.FORWARD,
this.resolution.handler.getContextServiceId(),
this.resolution.handler.getServletInfo().isAsyncSupported());
- final String requestURI = UriUtils.relativePath(req.getContextPath(), req.getRequestURI());
+ final String requestURI = UriUtils.concat(this.requestInfo.servletPath, this.requestInfo.pathInfo);
final FilterHandler[] filterHandlers = this.resolution.handlerRegistry.getFilterHandlers(this.resolution.handler, DispatcherType.FORWARD, requestURI);
final FilterChain filterChain = new InvocationChain(resolution.handler, filterHandlers);
@@ -95,7 +95,7 @@
DispatcherType.INCLUDE,
this.resolution.handler.getContextServiceId(),
this.resolution.handler.getServletInfo().isAsyncSupported());
- final String requestURI = UriUtils.relativePath(req.getContextPath(), req.getRequestURI());
+ final String requestURI = UriUtils.concat(this.requestInfo.servletPath, this.requestInfo.pathInfo);
final FilterHandler[] filterHandlers = this.resolution.handlerRegistry.getFilterHandlers(this.resolution.handler, DispatcherType.INCLUDE, requestURI);
final FilterChain filterChain = new InvocationChain(resolution.handler, filterHandlers);