craigmcc 01/11/19 10:25:39
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java
Log:
Avoid double slashes in the values returned by something like
ServletContext.getResourcePaths("/images/").
Revision Changes Path
1.33 +5 -5
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
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ApplicationContext.java 2001/09/11 01:34:50 1.32
+++ ApplicationContext.java 2001/11/19 18:25:39 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.32 2001/09/11 01:34:50 remm Exp $
- * $Revision: 1.32 $
- * $Date: 2001/09/11 01:34:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.33 2001/11/19 18:25:39 craigmcc Exp $
+ * $Revision: 1.33 $
+ * $Date: 2001/11/19 18:25:39 $
*
* ====================================================================
*
@@ -113,7 +113,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.32 $ $Date: 2001/09/11 01:34:50 $
+ * @version $Revision: 1.33 $ $Date: 2001/11/19 18:25:39 $
*/
public class ApplicationContext
@@ -1063,7 +1063,7 @@
Binding binding = (Binding) childPaths.nextElement();
String name = binding.getName();
StringBuffer childPath = new StringBuffer(path);
- if (!"/".equals(path))
+ if (!"/".equals(path) && !path.endsWith("/"))
childPath.append("/");
childPath.append(name);
Object object = binding.getObject();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
