luehe 2004/03/16 11:25:39
Modified: catalina/src/share/org/apache/coyote/tomcat5
MapperListener.java
Log:
Fix for Bugzilla 27664 ("Welcome files not found in combination with
jsp-property-group")
Rather than having the JspServlet know about welcome files, the mapper
algorithm has been amended to search for welcome files in URI spaces
that match a url-pattern in a jsp-property-group.
Please review carefully and let me know what you think.
Revision Changes Path
1.19 +4 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java
Index: MapperListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MapperListener.java 27 Feb 2004 14:58:53 -0000 1.18
+++ MapperListener.java 16 Mar 2004 19:25:39 -0000 1.19
@@ -469,7 +469,10 @@
mBeanServer.invoke(objectName, "findMappingObject", null, null);
for (int i = 0; i < mappings.length; i++) {
- mapper.addWrapper(hostName, contextName, mappings[i], wrapper);
+ boolean jspWildCard = (wrapperName.equals("jsp")
+ && mappings[i].endsWith("/*"));
+ mapper.addWrapper(hostName, contextName, mappings[i], wrapper,
+ jspWildCard);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
