Author: liem_nguyen Date: 2009-11-10 22:03:45 -0500 (Tue, 10 Nov 2009) New Revision: 558 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java Log: GTNPORTAL-172 There is an exception when click Portal properties in special case (Re-opened) (Fix after merge branches source code) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-11-11 00:42:33 UTC (rev 557) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-11-11 03:03:45 UTC (rev 558) @@ -546,23 +546,20 @@ private void build(ContainerData parent, Map<String, String> hierarchyRelationships) { String parentId = parent.getStorageId(); - if (parentId != null) + for (ModelData child : parent.getChildren()) { - for (ModelData child : parent.getChildren()) + String childId = child.getStorageId(); + if (childId != null) { - String childId = child.getStorageId(); - if (childId != null) + if (hierarchyRelationships.put(childId, parentId) != null) { - if (hierarchyRelationships.put(childId, parentId) != null) - { - throw new AssertionError("The same object is present two times in the object hierarchy"); - } - if (child instanceof ContainerData) - { - build((ContainerData)child, hierarchyRelationships); - } - } + throw new AssertionError("The same object is present two times in the object hierarchy"); + } } + if (child instanceof ContainerData) + { + build((ContainerData)child, hierarchyRelationships); + } } }