geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r427989 - in /geronimo/sandbox/svkmerge/trunk: ./ modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Date Wed, 02 Aug 2006 14:12:49 GMT
Author: jdillon
Date: Wed Aug  2 07:12:48 2006
New Revision: 427989

URL: http://svn.apache.org/viewvc?rev=427989&view=rev
Log:
 r605@dyn456093 (orig r427256):  jbohn | 2006-07-31 13:52:03 -0700
 GERONIMO-2241 prevent duplicate attributes with both values and null in config.xml

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Aug  2 07:12:48 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427211
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427256

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=427989&r1=427988&r2=427989&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Wed Aug  2 07:12:48 2006
@@ -352,6 +352,9 @@
             	setNullAttribute(name);
             }
             else {
+                if (getNullAttribute(name)) {
+                    nullAttributes.remove(name);
+                }
                 if(name.toLowerCase().indexOf("password") > -1) {
                     value = EncryptionManager.encrypt(value);
                 }



Mime
View raw message