From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 30 Nov 2010 17:42:01 +0000 (+0000)
Subject: Context name rather than Context path is passed in so construct ContextName object... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7dd4fae72f3b73531d575823e1822819c30f2c66;p=tomcat7.0

Context name rather than Context path is passed in so construct ContextName object correctly.

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

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index e8fe5726e..7030d7f66 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -478,7 +478,7 @@ public class HostConfig
 
         File appBase = appBase();
         File configBase = configBase();
-        ContextName cn = new ContextName(name, null);
+        ContextName cn = new ContextName(name);
         String baseName = cn.getBaseName();
         
         // Deploy XML descriptors from configBase
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9b0ace2c7..b5ceff3f8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -76,6 +76,9 @@
         Further Lifecycle refactoring for Connectors and associated components.
         (markt)
       </fix>
+      <fix>
+        Correct handling of versioned web applications in deployer. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">