Author: nfilotto Date: 2010-03-29 14:37:02 -0400 (Mon, 29 Mar 2010) New Revision: 2182 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java Log: EXOJCR-613: Recall the method getItemData(String) when it is needed to avoid useless call to the database. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-03-29 17:57:07 UTC (rev 2181) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-03-29 18:37:02 UTC (rev 2182) @@ -558,11 +558,7 @@ childNodes = super.getChildNodesData(nodeData); if (cache.isEnabled()) { - NodeData parentData = (NodeData)cache.get(nodeData.getIdentifier()); - if (parentData == null) - { - parentData = (NodeData)super.getItemData(nodeData.getIdentifier()); - } + NodeData parentData = (NodeData)getItemData(nodeData.getIdentifier()); if (parentData != null) { @@ -621,11 +617,7 @@ // TODO childProperties.size() > 0 for SDB if (childProperties.size() > 0 && cache.isEnabled()) { - NodeData parentData = (NodeData)cache.get(nodeData.getIdentifier()); - if (parentData == null) - { - parentData = (NodeData)super.getItemData(nodeData.getIdentifier()); - } + NodeData parentData = (NodeData)getItemData(nodeData.getIdentifier()); if (parentData != null) { @@ -721,11 +713,7 @@ // TODO propertiesList.size() > 0 for SDB if (propertiesList.size() > 0 && cache.isEnabled()) { - NodeData parentData = (NodeData)cache.get(nodeData.getIdentifier()); - if (parentData == null) - { - parentData = (NodeData)super.getItemData(nodeData.getIdentifier()); - } + NodeData parentData = (NodeData)getItemData(nodeData.getIdentifier()); if (parentData != null) {