Author: remy.maucherat(a)jboss.com Date: 2008-10-07 08:32:35 -0400 (Tue, 07 Oct 2008) New Revision: 804 Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java trunk/webapps/docs/changelog.xml Log: - Minor deployer fix. Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2008-10-06 16:14:12 UTC (rev 803) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2008-10-07 12:32:35 UTC (rev 804) @@ -854,9 +854,9 @@ docBase = "ROOT"; } else { if (path.startsWith("/")) { - docBase = path.substring(1); + docBase = path.substring(1).replace('/', '#'); } else { - docBase = path; + docBase = path.replace('/', '#'); } } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-10-06 16:14:12 UTC (rev 803) +++ trunk/webapps/docs/changelog.xml 2008-10-07 12:32:35 UTC (rev 804) @@ -52,6 +52,9 @@ <fix> CGI servlet generics cleanup. (markt) </fix> + <fix> + Better nested context handling. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote">