Handle nested contexts when foo#bar.xml exists

Bug reported on users list

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@702208 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 0899667..78c91af 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -854,9 +854,9 @@ public class ContextConfig
                 docBase = "ROOT";
             } else {
                 if (path.startsWith("/")) {
-                    docBase = path.substring(1);
+                    docBase = path.substring(1).replace('/', '#');
                 } else {
-                    docBase = path;
+                    docBase = path.replace('/', '#');
                 }
             }
         }