diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java index cda7d8f384..fce0877b72 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java @@ -205,7 +205,7 @@ public class FilePlanChildrenRelation implements RelationshipResourceAction.Read return createdNodes; } }; - List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get the nodes info List result = new ArrayList<>(nodeInfos.size()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanEntityResource.java index c2fa329a16..8871e57269 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanEntityResource.java @@ -134,7 +134,7 @@ public class FilePlanEntityResource return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); return nodesModelFactory.createFilePlan(info, parameters, null, false); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoriesEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoriesEntityResource.java index e3addac7b6..5ab0005162 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoriesEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoriesEntityResource.java @@ -128,7 +128,7 @@ public class RecordCategoriesEntityResource implements return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); return nodesModelFactory.createRecordCategory(info, parameters, null, false); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java index 1d600a6ebf..8da2cbf427 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java @@ -196,7 +196,7 @@ public class RecordCategoryChildrenRelation implements RelationshipResourceActio return createdNodes; } }; - List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); for (NodeRef nodeInfo : createdNodes) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderChildrenRelation.java index ab68cf9ed4..84a6b1f84a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderChildrenRelation.java @@ -173,7 +173,7 @@ public class RecordFolderChildrenRelation implements RelationshipResourceAction. return createdNodes; } }; - List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get the nodes info List result = new LinkedList<>(); @@ -211,7 +211,7 @@ public class RecordFolderChildrenRelation implements RelationshipResourceAction. uploadInfo.getContent().getInputStream()); } }; - NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get file info for response FileInfo info = fileFolderService.getFileInfo(newNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderEntityResource.java index c582f41888..6b88373e6f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordfolders/RecordFolderEntityResource.java @@ -123,7 +123,7 @@ public class RecordFolderEntityResource implements EntityResourceAction.ReadById return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); return nodesModelFactory.createRecordFolder(info, parameters, null, false); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/records/RecordsEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/records/RecordsEntityResource.java index 1b3e18b1eb..78dc66df5d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/records/RecordsEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/records/RecordsEntityResource.java @@ -214,7 +214,7 @@ public class RecordsEntityResource implements BinaryResourceAction.Read, return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // return record state FileInfo info = fileFolderService.getFileInfo(record); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/TransferContainerEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/TransferContainerEntityResource.java index 7e0ea82040..129245007b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/TransferContainerEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/TransferContainerEntityResource.java @@ -126,7 +126,7 @@ public class TransferContainerEntityResource implements return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); return nodesModelFactory.createTransferContainer(info, parameters, null, false); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerChildrenRelation.java index 2e026f856c..f163b7a796 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerChildrenRelation.java @@ -226,7 +226,7 @@ public class UnfiledContainerChildrenRelation implements RelationshipResourceAct return apiUtils.uploadRecord(parentNodeRef, uploadInfo.getFileName(), uploadInfo.getNodeType(), uploadInfo.getProperties(), uploadInfo.getContent().getInputStream()); } }; - NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get file info for response FileInfo info = fileFolderService.getFileInfo(newNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerEntityResource.java index 9be5f5a79e..551b288a2c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/UnfiledContainerEntityResource.java @@ -124,7 +124,7 @@ public class UnfiledContainerEntityResource return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); apiUtils.postActivity(info, unfiledContainerInfo.getParentId(), ActivityType.FILE_UPDATED); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java index aebe691a3b..b9c968c5a5 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java @@ -198,7 +198,7 @@ public class UnfiledRecordFolderChildrenRelation implements RelationshipResource return createdNodes; } }; - List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + List createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get the nodes info List result = new LinkedList<>(); @@ -234,7 +234,7 @@ public class UnfiledRecordFolderChildrenRelation implements RelationshipResource return apiUtils.uploadRecord(parentNodeRef, uploadInfo.getFileName(), uploadInfo.getNodeType(), uploadInfo.getProperties(), uploadInfo.getContent().getInputStream()); } }; - NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback); + NodeRef newNode = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); // Get file info for response FileInfo info = fileFolderService.getFileInfo(newNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderEntityResource.java index bf626a0020..651c46ba34 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderEntityResource.java @@ -128,7 +128,7 @@ public class UnfiledRecordFolderEntityResource implements EntityResourceAction.R return null; } }; - transactionService.getRetryingTransactionHelper().doInTransaction(callback); + transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); FileInfo info = fileFolderService.getFileInfo(nodeRef); apiUtils.postActivity(info, unfiledRecordFolderInfo.getParentId(), ActivityType.FILE_UPDATED);