remm 02/04/29 00:54:37
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch ApplicationContext.java
Log:
- Port patch for bug 6662.
Revision Changes Path
No revision
No revision
1.32.2.2 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -r1.32.2.1 -r1.32.2.2
--- ApplicationContext.java 27 Feb 2002 19:20:18 -0000 1.32.2.1
+++ ApplicationContext.java 29 Apr 2002 07:54:37 -0000 1.32.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.32.2.1 2002/02/27 19:20:18 remm Exp $
- * $Revision: 1.32.2.1 $
- * $Date: 2002/02/27 19:20:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.32.2.2 2002/04/29 07:54:37 remm Exp $
+ * $Revision: 1.32.2.2 $
+ * $Date: 2002/04/29 07:54:37 $
*
* ====================================================================
*
@@ -113,7 +113,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.32.2.1 $ $Date: 2002/02/27 19:20:18 $
+ * @version $Revision: 1.32.2.2 $ $Date: 2002/04/29 07:54:37 $
*/
public class ApplicationContext
@@ -421,6 +421,8 @@
// Return the current context if requested
String contextPath = context.getPath();
+ if (!contextPath.endsWith("/"))
+ contextPath = contextPath + "/";
if ((contextPath.length() > 0) &&
(uri.startsWith(contextPath))) {
return (this);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
