inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
61167: Removed in-txn exception absorbtion and replaced with a node exists check


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 15:01:09 +00:00
parent 3f9c22dd32
commit 3aa31d4ba2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
View File

@@ -489,19 +489,17 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
public void purgeArchivedNode(final NodeRef archivedNodeRef) public void purgeArchivedNode(final NodeRef archivedNodeRef)
{ {
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper(); RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Object> deleteCallback = new RetryingTransactionCallback<Object>() RetryingTransactionCallback<Void> deleteCallback = new RetryingTransactionCallback<Void>()
{ {
public Object execute() throws Exception public Void execute() throws Exception
{ {
try if (!nodeService.exists(archivedNodeRef))
{ {
// Node has disappeared
return null;
}
invokeBeforePurgeNode(archivedNodeRef); invokeBeforePurgeNode(archivedNodeRef);
nodeService.deleteNode(archivedNodeRef); nodeService.deleteNode(archivedNodeRef);
}
catch (InvalidNodeRefException e)
{
// ignore
}
return null; return null;
} }
}; };