svn commit: r1691990 - /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java

[cziegeler]

Author: cziegeler
Date: Mon Jul 20 17:58:19 2015
New Revision: 1691990

URL: http://svn.apache.org/r1691990
Log:
Fix filter handling for includes and forwards

Modified:
    
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java

Modified: 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java?rev=1691990&r1=1691989&r2=1691990&view=diff
==============================================================================
--- 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
 (original)
+++ 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
 Mon Jul 20 17:58:19 2015
@@ -68,7 +68,7 @@ public final class RequestDispatcherImpl
                     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 @@ public final class RequestDispatcherImpl
                 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);