remm 01/01/13 18:36:52
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Oops, I wan't normalizing the right thing, which was causing problems depending
on how the servlet mappings were configured.
Revision Changes Path
1.22 +6 -6
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultServlet.java 2001/01/13 21:24:48 1.21
+++ DefaultServlet.java 2001/01/14 02:36:52 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.21 2001/01/13 21:24:48 remm Exp $
- * $Revision: 1.21 $
- * $Date: 2001/01/13 21:24:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.22 2001/01/14 02:36:52 remm Exp $
+ * $Revision: 1.22 $
+ * $Date: 2001/01/14 02:36:52 $
*
* ====================================================================
*
@@ -118,7 +118,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.21 $ $Date: 2001/01/13 21:24:48 $
+ * @version $Revision: 1.22 $ $Date: 2001/01/14 02:36:52 $
*/
public class DefaultServlet
@@ -444,14 +444,14 @@
}
// No, extract the desired path directly from the request
- String result = normalize(request.getPathInfo());
+ String result = request.getPathInfo();
if (result == null) {
result = request.getServletPath();
}
if ((result == null) || (result.equals(""))) {
result = "/";
}
- return result;
+ return normalize(result);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
