Author: markt
Date: Mon Dec 13 15:06:13 2010
New Revision: 1045162
URL: http://svn.apache.org/viewvc?rev=1045162&view=rev
Log:
Aliases were broken if the context was reloaded
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1045162&r1=1045161&r2=1045162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Dec
13 15:06:13 2010
@@ -149,6 +149,8 @@ standardContext.urlDecode=Cannot URL dec
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
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1045162&r1=1045161&r2=1045162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Dec 13
15:06:13 2010
@@ -4636,6 +4636,8 @@ public class StandardContext extends Con
((BaseDirContext) webappResources).setCacheMaxSize
(getCacheMaxSize());
((BaseDirContext) webappResources).allocate();
+ // Alias support
+ ((BaseDirContext) webappResources).setAliases(getAliases());
}
// Register the cache in JMX
if (isCachingAllowed()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1045162&r1=1045161&r2=1045162&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 13 15:06:13 2010
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
