Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 15052bddc -> f8f1fe8a2
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/f8f1fe8a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f8f1fe8a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f8f1fe8a Branch: refs/heads/tomee-1.7.x Commit: f8f1fe8a2894007dd42dcccd6540da0a70846b54 Parents: 15052bd Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 19 10:36:33 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Jan 19 10:36:33 2015 +0100 ---------------------------------------------------------------------- .../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/f8f1fe8a/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; } }
