inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

SHA-1930 : Unable to delete folder, when the folder contains shortcut link to the same folder

Browse Source 
- Check link for PENDING_DELETE aspect before trying to delete it
   - Added unit test for case

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ramona Neamtu
2016-11-22 11:51:11 +00:00
parent a514f96d30
commit aa591b1362
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/doclink/DocumentLinkServiceImpl.java
View File

@@ -304,12 +304,15 @@ public class DocumentLinkServiceImpl implements DocumentLinkService, NodeService
for (NodeRef linkRef : linkNodeRefs) for (NodeRef linkRef : linkNodeRefs)
{ {
try try
{
if (!nodeService.hasAspect(linkRef, ContentModel.ASPECT_PENDING_DELETE))
{ {
nodeService.deleteNode(linkRef); nodeService.deleteNode(linkRef);
/* if the node was successfully deleted increment the count */ /* if the node was successfully deleted increment the count */
report.incrementDeletedLinksCount(); report.incrementDeletedLinksCount();
} }
}
catch (AccessDeniedException ex) catch (AccessDeniedException ex)
{ {
/* if the node could not be deleted add it to the report */ /* if the node could not be deleted add it to the report */