don't override jaxrs by *.xxx mappings
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ddb55fbc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ddb55fbc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ddb55fbc Branch: refs/heads/tomee-1.7.x Commit: ddb55fbcf95fca3d8651d0a6c5b32e45072387fa Parents: be873a7 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 26 14:47:10 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Jan 26 14:47:10 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ddb55fbc/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 39907ca..5dd4ac9 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 @@ -121,7 +121,8 @@ public class CXFJAXRSFilter implements Filter { accept = false; if (!"org.apache.catalina.servlets.DefaultServlet".equals(wrapper.getServletClass())) { for (final String mapping : wrapper.findMappings()) { - if (!mapping.isEmpty() && !"/*".equals(mapping) && !"/".equals(mapping) && mapping.startsWith(this.mapping)) { + if (!mapping.isEmpty() && !"/*".equals(mapping) && !"/".equals(mapping) && !mapping.startsWith("*") + && mapping.startsWith(this.mapping)) { accept = true; break; }
