[exo-jcr-commits] exo-jcr SVN: r3685 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Dec 20 08:11:44 EST 2010
Author: dkuleshov
Date: 2010-12-20 08:11:43 -0500 (Mon, 20 Dec 2010)
New Revision: 3685
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
Log:
EXOJCR-1113: SessionDataManager.listChildPropertiesData(NodeData parent) now does not return ValueDatas
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-12-20 12:54:25 UTC (rev 3684)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-12-20 13:11:43 UTC (rev 3685)
@@ -984,7 +984,7 @@
try
{
- return (List<PropertyData>)mergeProps(parent, transactionableManager);
+ return (List<PropertyData>)mergeProps(parent, false, transactionableManager);
}
finally
{
@@ -1010,7 +1010,7 @@
try
{
- return (List<PropertyData>)mergeProps(parent, transactionableManager);
+ return (List<PropertyData>)mergeProps(parent, true, transactionableManager);
}
finally
{
@@ -1982,9 +1982,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);
@@ -1993,7 +1995,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)
More information about the exo-jcr-commits
mailing list