svn commit: r831440 - /tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java

[apetrelli]

Author: apetrelli
Date: Fri Oct 30 20:18:41 2009
New Revision: 831440

URL: http://svn.apache.org/viewvc?rev=831440&view=rev
Log:
TILES-483
Fixed cascaded attribute management.

Modified:
    
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java

Modified: 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java?rev=831440&r1=831439&r2=831440&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
 Fri Oct 30 20:18:41 2009
@@ -69,7 +69,6 @@
      * @since 2.1.0
      */
     public BasicAttributeContext() {
-        super();
     }
 
     /**
@@ -254,8 +253,9 @@
         }
 
         if (attributes == null) {
-            attributes = new HashMap<String, Attribute>(defaultAttributes);
+            attributes = new HashMap<String, Attribute>();
             if (cascadedAttributes == null || cascadedAttributes.isEmpty()) {
+                attributes.putAll(defaultAttributes);
                 return;
             }
         }
@@ -264,7 +264,7 @@
         for (Map.Entry<String, Attribute> entry : entries) {
             String key = entry.getKey();
             if (!attributes.containsKey(key)
-                    && (cascadedAttributes == null || cascadedAttributes
+                    && (cascadedAttributes == null || !cascadedAttributes
                             .containsKey(key))) {
                 attributes.put(entry.getKey(), entry.getValue());
             }