tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r451846 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
Date Mon, 02 Oct 2006 00:38:43 GMT
Author: markt
Date: Sun Oct  1 17:38:42 2006
New Revision: 451846

URL: http://svn.apache.org/viewvc?view=rev&rev=451846
Log:
Port fix bug 29727. Changes to env-entry values should take effect on web-app reload.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?view=diff&rev=451846&r1=451845&r2=451846
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java Sun Oct  1 17:38:42
2006
@@ -190,10 +190,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);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message