luehe 2004/03/16 14:18:35
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix for Bugzilla 27664 ("Welcome files not found in combination with
jsp-property-group") [cont.]
Revision Changes Path
1.118 +20 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- StandardContext.java 27 Feb 2004 14:58:42 -0000 1.117
+++ StandardContext.java 16 Mar 2004 22:18:35 -0000 1.118
@@ -1939,7 +1939,7 @@
}
if( findChild(servletName) != null) {
- addServletMapping(pattern, servletName);
+ addServletMapping(pattern, servletName, true);
} else {
log.debug("Skiping " + pattern + " , no servlet " + servletName);
}
@@ -2130,7 +2130,24 @@
* is not known to this Context
*/
public void addServletMapping(String pattern, String name) {
+ addServletMapping(pattern, name, false);
+ }
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
+ * @param pattern URL pattern to be mapped
+ * @param name Name of the corresponding servlet to execute
+ * @param jspWildCard true if name identifies the JspServlet
+ * and pattern contains a wildcard; false otherwise
+ *
+ * @exception IllegalArgumentException if the specified servlet name
+ * is not known to this Context
+ */
+ public void addServletMapping(String pattern, String name,
+ boolean jspWildCard) {
// Validate the proposed mapping
if (findChild(name) == null)
throw new IllegalArgumentException
@@ -2155,7 +2172,7 @@
wrapper.addMapping(pattern);
// Update context mapper
- mapper.addWrapper(pattern, wrapper);
+ mapper.addWrapper(pattern, wrapper, jspWildCard);
fireContainerEvent("addServletMapping", pattern);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
