Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56653

Konstantin Kolinko · Konstantin Kolinko · commit be5909d4896e · 2014-06-23T21:17:12.000Z
Alternative fix for aliases support issue git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1604940 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/mapper/Mapper.java b/java/org/apache/catalina/mapper/Mapper.java
@@ -181,6 +181,21 @@ public synchronized void removeHostAlias(String alias) {
 
     }
 
+    /**
+     * Replace {@link MappedHost#contextList} field in <code>realHost</code> and
+     * all its aliases with a new value.
+     */
+    private void updateContextList(MappedHost realHost,
+            ContextList newContextList) {
+
+        // The real host and all the aliases map to the same host object
+        Host object = realHost.object;
+        for (MappedHost host : hosts) {
+            if (host.object == object) {
+                host.contextList = newContextList;
+            }
+        }
+    }
 
     /**
      * Add a new Context to an existing Host.
@@ -211,13 +226,16 @@ public void addContextVersion(String hostName, Host host, String path,
             ContextVersion newContextVersion = new ContextVersion(version,
                     path, slashCount, context, resources, welcomeResources);
 
-            MappedContext mappedContext = exactFind(
-                    mappedHost.contextList.contexts, path);
+            ContextList contextList = mappedHost.contextList;
+            MappedContext mappedContext = exactFind(contextList.contexts, path);
             if (mappedContext == null) {
                 mappedContext = new MappedContext(path, newContextVersion);
-                mappedHost.contextList = mappedHost.contextList.addContext(
+                ContextList newContextList = contextList.addContext(
                         mappedContext, slashCount);
-                contextObjectToContextVersionMap.put(context, newContextVersion);
+                if (newContextList != null) {
+                    updateContextList(mappedHost, newContextList);
+                    contextObjectToContextVersionMap.put(context, newContextVersion);
+                }
             } else {
                 ContextVersion[] contextVersions = mappedContext.versions;
                 ContextVersion[] newContextVersions = new ContextVersion[contextVersions.length + 1];
@@ -251,7 +269,8 @@ public void removeContextVersion(Context ctxt, String hostName,
         }
 
         synchronized (host) {
-            MappedContext context = exactFind(host.contextList.contexts, path);
+            ContextList contextList = host.contextList;
+            MappedContext context = exactFind(contextList.contexts, path);
             if (context == null) {
                 return;
             }
@@ -262,7 +281,10 @@ public void removeContextVersion(Context ctxt, String hostName,
             if (removeMap(contextVersions, newContextVersions, version)) {
                 if (newContextVersions.length == 0) {
                     // Remove the context
-                    host.contextList = host.contextList.removeContext(path);
+                    ContextList newContextList = contextList.removeContext(path);
+                    if (newContextList != null) {
+                        updateContextList(host, newContextList);
+                    }
                 } else {
                     context.versions = newContextVersions;
                 }
@@ -1463,7 +1485,7 @@ public ContextList addContext(MappedContext mappedContext,
                 return new ContextList(newContexts, Math.max(nesting,
                         slashCount));
             }
-            return this;
+            return null;
         }
 
         public ContextList removeContext(String path) {
@@ -1475,7 +1497,7 @@ public ContextList removeContext(String path) {
                 }
                 return new ContextList(newContexts, newNesting);
             }
-            return this;
+            return null;
         }
     }
 
