we need to take into account welcome files
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cb135dd6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cb135dd6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cb135dd6 Branch: refs/heads/old-release-tomee-1.7.2 Commit: cb135dd6344f93ed24888cafcc05d0cfbb0c62a9 Parents: 544806d Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 19 10:36:33 2015 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Mon Jan 19 09:42:16 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/cb135dd6/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java index b955973..4b81f40 100644 --- a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java +++ b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java @@ -80,12 +80,10 @@ public class CXFJAXRSFilter implements Filter { chain.doFilter(request, response); return; } - if (delegate.matchPath(httpServletRequest)) { - final InputStream staticContent = delegate.findStaticContent(httpServletRequest, welcomeFiles); - if (staticContent != null) { - chain.doFilter(request, response); - return; - } + final InputStream staticContent = delegate.findStaticContent(httpServletRequest, welcomeFiles); + if (staticContent != null) { + chain.doFilter(request, response); + return; } }
