From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Oct 2008 17:30:44 +0000 (+0000)
Subject: Handle nested contexts when foo#bar.xml exists
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=43613e620fa61f5270b0b8777724562b520eedff;p=tomcat7.0

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 08996679c..78c91afe0 100644
--- 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('/', '#');
                 }
             }
         }