You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/01/19 10:37:26 UTC
tomee git commit: we need to take into account welcomefiles
Repository: tomee
Updated Branches:
refs/heads/develop 1ee61d2cf -> 688743bbd
we need to take into account welcomefiles
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/688743bb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/688743bb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/688743bb
Branch: refs/heads/develop
Commit: 688743bbd63768522a914d8027b15d4385d1fbed
Parents: 1ee61d2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Jan 19 10:37:04 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Jan 19 10:37:04 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/688743bb/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 85c2445..436f049 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;
}
}