Author: dkuleshov Date: 2010-12-20 03:22:12 -0500 (Mon, 20 Dec 2010) New Revision: 3678 Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java Log: JCR-1541: SessionDataManager.listChildPropertiesData(NodeData parent) now does not return ValueDatas Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-12-17 11:44:29 UTC (rev 3677) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-12-20 08:22:12 UTC (rev 3678) @@ -864,7 +864,7 @@ try { - return (List<PropertyData>)mergeProps(parent, transactionableManager); + return (List<PropertyData>)mergeProps(parent, false, transactionableManager); } finally { @@ -890,7 +890,7 @@ try { - return (List<PropertyData>)mergeProps(parent, transactionableManager); + return (List<PropertyData>)mergeProps(parent, true, transactionableManager); } finally { @@ -1859,9 +1859,11 @@ * from outgoing list WARN. THIS METHOD HAS SIBLING - mergeList, see below. * * @param rootData + * @param listOnly * @return */ - protected List<? extends ItemData> mergeProps(ItemData rootData, DataManager dataManager) throws RepositoryException + protected List<? extends ItemData> mergeProps(ItemData rootData, boolean listOnly, DataManager dataManager) + throws RepositoryException { // 1 get all transient descendants Collection<ItemState> transientDescendants = changesLog.getLastChildrenStates(rootData, false); @@ -1870,7 +1872,7 @@ { // 2 get ALL persisted descendants Map<String, ItemData> descendants = new LinkedHashMap<String, ItemData>(); - traverseStoredDescendants(rootData, dataManager, MERGE_PROPS, descendants, false, transientDescendants); + traverseStoredDescendants(rootData, dataManager, MERGE_PROPS, descendants, listOnly, transientDescendants); // merge data for (ItemState state : transientDescendants)