geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428829 - in /geronimo/sandbox/svkmerge/m2migration/modules/system/src: ./ java/org/apache/geronimo/system/configuration/GBeanOverride.java
Date Fri, 04 Aug 2006 18:30:49 GMT
Author: jdillon
Date: Fri Aug  4 11:30:48 2006
New Revision: 428829

URL: http://svn.apache.org/viewvc?rev=428829&view=rev
Log:
 r620@jason-dillons-computer (orig r427989):  jdillon | 2006-08-02 07:12:48 -0700
  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/m2migration/modules/system/src/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/system/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  4 11:30:48 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:426503
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:427989

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=428829&r1=428828&r2=428829&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Fri Aug  4 11:30: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