Author: remy.maucherat(a)jboss.com Date: 2007-10-10 23:34:40 -0400 (Wed, 10 Oct 2007) New Revision: 305 Modified: trunk/java/org/apache/catalina/core/StandardContext.java Log: - Support '*' servlet-name mapping for filter-mapping. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2007-10-11 00:39:13 UTC (rev 304) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2007-10-11 03:34:40 UTC (rev 305) @@ -2194,7 +2194,9 @@ if (findFilterDef(filterName) == null) throw new IllegalArgumentException (sm.getString("standardContext.filterMap.name", filterName)); - if ((servletNames.length == 0) && (urlPatterns.length == 0)) + if (!filterMap.getMatchAllServletNames() + && !filterMap.getMatchAllUrlPatterns() + && (servletNames.length == 0) && (urlPatterns.length == 0)) throw new IllegalArgumentException (sm.getString("standardContext.filterMap.either")); // FIXME: Older spec revisions may still check this