From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 31 Oct 2010 13:11:55 +0000 (+0000)
Subject: Parallel deployment
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3717f690bb1485f6f530e09aa86819ca5b3d3482;p=tomcat7.0

Parallel deployment
Start to separate context.name and context.path
Currently name==path but eventually name may include a version element but path will not.

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index b1c2a792e..d08fb7854 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -325,6 +325,12 @@ public class StandardContext extends ContainerBase
     
 
     /**
+     * Unencoded path for this web application.
+     */
+    private String path = null;
+
+
+    /**
      * The "follow standard delegation model" flag that will be used to
      * configure our ClassLoader.
      */
@@ -924,13 +930,6 @@ public class StandardContext extends ContainerBase
     }
 
 
-    @Override
-    public void setName( String name ) {
-        super.setName( name );
-        encodedPath = urlEncoder.encode(name);
-    }
-
-
     /**
      * Is caching allowed ?
      */
@@ -1870,25 +1869,22 @@ public class StandardContext extends ContainerBase
      */
     @Override
     public String getPath() {
-
-        return (getName());
-
+        return (path);
     }
 
     
     /**
      * Set the context path for this Context.
-     * <p>
-     * <b>IMPLEMENTATION NOTE</b>:  The context path is used as the "name" of
-     * a Context, because it must be unique.
-     *
+     * 
      * @param path The new context path
      */
     @Override
     public void setPath(String path) {
-
-        setName(path);
-
+        this.path = path;
+        encodedPath = urlEncoder.encode(path);
+        if (getName() == null) {
+            setName(path);
+        }
     }