[infinispan-commits] Infinispan SVN: r1050 - trunk/core/src/main/java/org/infinispan/config.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-10-28 14:16:22 -0400 (Wed, 28 Oct 2009)
New Revision: 1050

Modified:
   trunk/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java
Log:
[ISPN-239] - Boolean values in configuration overrides are either lost or overriden incorrectly

Modified: trunk/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java	2009-10-28 17:05:34 UTC (rev 1049)
+++ trunk/core/src/main/java/org/infinispan/config/OverrideConfigurationVisitor.java	2009-10-28 18:16:22 UTC (rev 1050)
@@ -71,13 +71,13 @@
 
    public void override(OverrideConfigurationVisitor override) {
       
-      //special handling for BooleanAttributeType
-      Set<Entry<String, BooleanAttributeType>> entrySet = override.bats.entrySet();      
+      // special handling for BooleanAttributeType
+      Set<Entry<String, BooleanAttributeType>> entrySet = override.bats.entrySet();
       for (Entry<String, BooleanAttributeType> entry : entrySet) {
-         BooleanAttributeType attributeType = bats.get(entry.getKey());
-         if(attributeType != null) {
-            attributeType.enabled = entry.getValue().enabled;
-         }
+         String booleanAttributeName = entry.getKey();
+         BooleanAttributeType attributeType = bats.get(booleanAttributeName);
+         BooleanAttributeType overrideAttributeType = override.bats.get(booleanAttributeName);
+         overrideFields(attributeType, overrideAttributeType);
       }
       
       //do we need to make clones of complex objects like list of cache loaders?