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

Merged 5.1.N (5.1.1) to HEAD (5.2)

Browse Source 
122653 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122623 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122577 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122484 amukha:       Reverse merged V4.2.6 (4.2.6)
                     118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
                        117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
                           - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 22:31:44 +00:00
parent 2b846bf0aa
commit 963320d6c2
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -65,7 +65,6 @@ import org.alfresco.repo.thumbnail.ThumbnailHelper;
import org.alfresco.repo.thumbnail.ThumbnailRegistry;
import org.alfresco.repo.thumbnail.script.ScriptThumbnail;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.version.VersionModel;
import org.alfresco.repo.workflow.jscript.JscriptWorkflowInstance;
import org.alfresco.scripts.ScriptException;
@@ -2041,16 +2040,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
if (nodeService.exists(this.nodeRef))
{
RetryingTransactionCallback<Void> deleteNode = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
nodeService.deleteNode(nodeRef);
return null;
}
};
services.getTransactionService().getRetryingTransactionHelper().doInTransaction(deleteNode, false, true);
this.nodeService.deleteNode(this.nodeRef);
success = true;
}