Author: pero
Date: Sat Sep 15 00:55:42 2007
New Revision: 575890
URL: http://svn.apache.org/viewvc?rev=575890&view=rev
Log:
SRV 6.2.5 says supporting for '*' as the servlet-name in filter-mapping.
<filter-mapping>
<filter-name>SampleFilter</filter-name>
<servlet-name>*</servlet-name>
</filter-mapping>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=575890&r1=575889&r2=575890&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sat
Sep 15 00:55:42 2007
@@ -2156,7 +2156,13 @@
if (findFilterDef(filterName) == null)
throw new IllegalArgumentException
(sm.getString("standardContext.filterMap.name", filterName));
- if ((servletNames.length == 0) && (urlPatterns.length == 0))
+// <= Servlet API 2.4
+// if ((servletNames.length == 0) && (urlPatterns.length == 0))
+// Servlet API 2.5 (FIX 43338)
+// SRV 6.2.5 says supporting for '*' as the servlet-name in
filter-mapping.
+ 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
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=575890&r1=575889&r2=575890&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Sep 15 00:55:42 2007
@@ -84,7 +84,11 @@
</update>
<fix>
o.a.juli.ClassLoaderLogManager handle more then one system property
replacement at file logging.properties. (pero)
- </fix>
+ </fix>
+ <fix>
+ <bug>43338</bug>: Support '*' servlet-name mapping at filter-mapping.
+ Patch provided by Keiichi Fujino. (pero)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
