Author: julien(a)jboss.com Date: 2007-06-26 17:31:19 -0400 (Tue, 26 Jun 2007) New Revision: 7568 Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java Log: revert JBPORTAL-1504 in order to fix it properly later 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 2007-06-26 21:24:19 UTC (rev 7567) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-26 21:31:19 UTC (rev 7568) @@ -405,52 +405,24 @@ { declaredPropertyMap.remove(name); - removeProperty(name); + // If aggregated properties is loaded then we udpate it + if (properties != null) + { + properties.remove(name); + } } else { declaredPropertyMap.put(name, value); - setProperty(name, value); - } - } - - private void removeProperty(String name) - { - if (properties != null) - { - properties.remove(name); - } - - Iterator it = this.getChildren().iterator(); - while (it.hasNext()) - { - PortalObject object = (PortalObject) it.next(); - if (object instanceof PortalObjectImpl) + // If aggregated properties is loaded then we udpate it + if (properties != null) { - ((PortalObjectImpl)object).removeProperty(name); + properties.put(name, value); } } } - private void setProperty(String name, String value) - { - if (properties != null) - { - properties.put(name, value); - } - - Iterator it = this.getChildren().iterator(); - while (it.hasNext()) - { - PortalObject object = (PortalObject) it.next(); - if (object instanceof PortalObjectImpl) - { - ((PortalObjectImpl)object).setProperty(name, value); - } - } - } - public String getProperty(String name) { if (name == null)