[portal-commits] JBoss Portal SVN: r5891 - trunk/core/src/main/org/jboss/portal/core/impl/model/portal

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-12-18 12:44:48 -0500 (Mon, 18 Dec 2006)
New Revision: 5891

Modified:
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
Log:
bug in portal object property aggregation.

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-12-18 17:41:50 UTC (rev 5890)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-12-18 17:44:48 UTC (rev 5891)
@@ -300,16 +300,21 @@
 
    public Map getProperties()
    {
+      // Lazy compute properties
       if (properties == null)
       {
-         Map properties = new HashMap();
-         ObjectNode node = objectNode;
-         while (node != null)
+         ObjectNode parent = objectNode.getParent();
+         if (parent == null)
          {
-            properties.putAll(node.getObject().declaredPropertyMap);
-            node = node.getParent();
+            properties = Collections.unmodifiableMap(declaredPropertyMap);
          }
-         this.properties = Collections.unmodifiableMap(properties);
+         else
+         {
+            Map properties = new HashMap();
+            properties.putAll(parent.getObject().getProperties());
+            properties.putAll(declaredPropertyMap);
+            this.properties = Collections.unmodifiableMap(properties);
+         }
       }
       return properties;
    }