Author: fhanik
Date: Thu Sep 27 08:01:15 2007
New Revision: 580052
URL: http://svn.apache.org/viewvc?rev=580052&view=rev
Log:
forward port from 6.0
Modified:
tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardContext.java?rev=580052&r1=580051&r2=580052&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardContext.java
Thu Sep 27 08:01:15 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
