Author: jsdelfino
Date: Wed Aug 15 18:42:44 2007
New Revision: 566466
URL: http://svn.apache.org/viewvc?view=rev&rev=566466
Log:
Fixed previous commit, which introduced a bug creating an incorrect servlet
mapping for the default Tomcat resource servlet.
Modified:
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
Modified:
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java?view=diff&rev=566466&r1=566465&r2=566466
==============================================================================
---
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
(original)
+++
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
Wed Aug 15 18:42:44 2007
@@ -176,17 +176,18 @@
ServletWrapper wrapper;
if (servlet instanceof DefaultResourceServlet) {
+ String defaultServletPath = path;
// Optimize the handling of resource requests, use the Tomcat
default servlet
// instead of our default resource servlet
- if (path.endsWith("*")) {
- path = path.substring(0, path.length()-1);
+ if (defaultServletPath.endsWith("*")) {
+ defaultServletPath = defaultServletPath.substring(0,
defaultServletPath.length()-1);
}
- if (path.endsWith("/")) {
- path = path.substring(0, path.length()-1);
+ if (defaultServletPath.endsWith("/")) {
+ defaultServletPath = defaultServletPath.substring(0,
defaultServletPath.length()-1);
}
DefaultResourceServlet resourceServlet =
(DefaultResourceServlet)servlet;
- TomcatDefaultServlet defaultServlet = new
TomcatDefaultServlet(path, resourceServlet.getDocumentRoot());
+ TomcatDefaultServlet defaultServlet = new
TomcatDefaultServlet(defaultServletPath, resourceServlet.getDocumentRoot());
wrapper = new ServletWrapper(defaultServlet);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
