You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/07/31 22:52:04 UTC

svn commit: r427256 - /geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Author: jbohn
Date: Mon Jul 31 13:52:03 2006
New Revision: 427256

URL: http://svn.apache.org/viewvc?rev=427256&view=rev
Log:
GERONIMO-2241 prevent duplicate attributes with both values and null in config.xml

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=427256&r1=427255&r2=427256&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java Mon Jul 31 13:52:03 2006
@@ -352,6 +352,9 @@
             	setNullAttribute(name);
             }
             else {
+                if (getNullAttribute(name)) {
+                    nullAttributes.remove(name);
+                }
                 if(name.toLowerCase().indexOf("password") > -1) {
                     value = EncryptionManager.encrypt(value);
                 }