Author: tolusha Date: 2009-12-29 07:16:11 -0500 (Tue, 29 Dec 2009) New Revision: 1230 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java Log: EXOJCR-344: small fix Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-12-29 11:56:33 UTC (rev 1229) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-12-29 12:16:11 UTC (rev 1230) @@ -1577,7 +1577,7 @@ protected List<? extends ItemData> mergeNodes(ItemData rootData, DataManager dataManager) throws RepositoryException { // 1 get all transient descendants - List<ItemState> transientDescendants = new ArrayList(changesLog.getLastChildrenStates(rootData, true)); + Collection<ItemState> transientDescendants = changesLog.getLastChildrenStates(rootData, true); if (!transientDescendants.isEmpty()) { @@ -1615,7 +1615,7 @@ protected List<? extends ItemData> mergeProps(ItemData rootData, DataManager dataManager) throws RepositoryException { // 1 get all transient descendants - List<ItemState> transientDescendants = new ArrayList(changesLog.getLastChildrenStates(rootData, false)); + Collection<ItemState> transientDescendants = changesLog.getLastChildrenStates(rootData, false); if (!transientDescendants.isEmpty()) { @@ -1712,7 +1712,8 @@ * @throws RepositoryException */ private void traverseStoredDescendants(ItemData parent, DataManager dataManager, int action, - Map<String, ItemData> ret, boolean listOnly, List<ItemState> transientDescendants) throws RepositoryException + Map<String, ItemData> ret, boolean listOnly, Collection<ItemState> transientDescendants) + throws RepositoryException { if (parent.isNode())