Author: markt
Date: Thu Sep 21 17:01:18 2006
New Revision: 448746
URL: http://svn.apache.org/viewvc?view=rev&rev=448746
Log:
Fix bug 29727. Changes to env-entry values should take effect on web-app reload.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java?view=diff&rev=448746&r1=448745&r2=448746
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
Thu Sep 21 17:01:18 2006
@@ -184,10 +184,14 @@
public void addEnvironment(ContextEnvironment environment) {
if (entries.containsKey(environment.getName())) {
- return;
- } else {
- entries.put(environment.getName(), environment.getType());
+ if (findEnvironment(environment.getName()).getOverride()) {
+ removeEnvironment(environment.getName());
+ } else {
+ return;
+ }
}
+
+ entries.put(environment.getName(), environment.getType());
synchronized (envs) {
environment.setNamingResources(this);
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=448746&r1=448745&r2=448746
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Sep 21 17:01:18 2006
@@ -14,6 +14,18 @@
</properties>
<body>
+<section name="Tomcat 5.5.21 (fhanik)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>29727</bug>: If env-entry values in web.xml are changed then
+ ensure new vales are applied when context is reloaded. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
+
<section name="Tomcat 5.5.20 (fhanik)">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
