svn commit: r946861 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

[djencks]

Author: djencks
Date: Fri May 21 03:56:10 2010
New Revision: 946861

URL: http://svn.apache.org/viewvc?rev=946861&view=rev
Log:
OPENEJB-1284 Put overriding env-entry xml by env-entries.properties under 
control of an option

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java?rev=946861&r1=946860&r2=946861&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
 Fri May 21 03:56:10 2010
@@ -17,6 +17,7 @@
 package org.apache.openejb.config;
 
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.jee.EnvEntry;
@@ -100,8 +101,10 @@ public class EnvEntriesPropertiesDeploye
     private void apply(JndiConsumer bean, EnvEntry newEntry, String 
componentName) {
         EnvEntry entry = bean.getEnvEntryMap().get(newEntry.getName());
         if (entry != null){
-            log.debug("envprops.override", componentName, entry.getName(), 
entry.getEnvEntryValue(), newEntry.getEnvEntryValue());
-            entry.setEnvEntryValue(newEntry.getEnvEntryValue());
+            if (SystemInstance.get().getOptions().get("envprops.override", 
false)) {
+                log.debug("envprops.override", componentName, entry.getName(), 
entry.getEnvEntryValue(), newEntry.getEnvEntryValue());
+                entry.setEnvEntryValue(newEntry.getEnvEntryValue());
+            }
             return;
         }