Merged V3.4 to HEAD

24331: Fixed ALF-5742: Error when deleting a space


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-12-08 13:42:24 +00:00
parent d317abfa36
commit f4bfb9407f

View File

@@ -2247,7 +2247,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
{
Long childNodeId = oldChildNodePair.getFirst();
NodeRef childNodeRef = oldChildNodePair.getSecond();
if (nodeDAO.getNodeRefStatus(childNodeRef).isDeleted())
NodeRef.Status childNodeStatus = nodeDAO.getNodeRefStatus(childNodeRef);
if (childNodeStatus == null || childNodeStatus.isDeleted())
{
// Node has already been deleted.
continue;