From 2dd77726d64ddd755053d41c86a14d0637247a6d Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 13 Dec 2010 15:06:13 +0000
Subject: [PATCH] Aliases were broken if the context was reloaded

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1045162 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/LocalStrings.properties | 2 ++
 java/org/apache/catalina/core/StandardContext.java    | 2 ++
 webapps/docs/changelog.xml                            | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 51472faa9..74d2dba7a 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -149,6 +149,8 @@ standardContext.urlDecode=Cannot URL decode request path {0}
 standardContext.urlPattern.patternWarning=WARNING: URL pattern {0} must start with a ''/'' in Servlet 2.4
 standardContext.urlValidate=Cannot validate URL decoded request path {0}
 standardContext.workPath=Exception obtaining work path for context [{0}]
+standardContext.workCreateException=Failed to determine absolute work directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
+standardContext.workCreateFail=Failed to create work directory [{0}] for context [{1}]
 standardContext.wrapper.error=JSP file {0} must start with a ''/'
 standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/'' in Servlet 2.4
 standardEngine.alreadyStarted=Engine has already been started
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 04e22c6c2..111791fc4 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4636,6 +4636,8 @@ public class StandardContext extends ContainerBase
                 ((BaseDirContext) webappResources).setCacheMaxSize
                     (getCacheMaxSize());
                 ((BaseDirContext) webappResources).allocate();
+                // Alias support
+                ((BaseDirContext) webappResources).setAliases(getAliases());
             }
             // Register the cache in JMX
             if (isCachingAllowed()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1d7f001a6..2aba5399d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,10 @@
         <bug>50448</bug>: Fix possible <code>IllegalStateException</code>
         caused by recent session management refactoring. (markt)
       </fix>
+      <fix>
+        Ensure aliases settings for a context are retained after a context is
+        reloaded. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0