From ea448e74cb0ca4ccf9b1d78ed94ea6cfacd1b899 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 Oct 2006 00:38:42 +0000
Subject: [PATCH] Port fix bug 29727. Changes to env-entry values should take
 effect on web-app reload.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@451846 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/deploy/NamingResources.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/deploy/NamingResources.java b/java/org/apache/catalina/deploy/NamingResources.java
index 7d145cf78..c3917f39d 100644
--- a/java/org/apache/catalina/deploy/NamingResources.java
+++ b/java/org/apache/catalina/deploy/NamingResources.java
@@ -190,10 +190,14 @@ public class NamingResources implements Serializable {
     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);
-- 
2.11.0