From c08013eef73a8f6157dc24686f4ea449cd1eef6a Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 16:12:53 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63384: Reverse Merge HEAD-BUG-FIX (4.3.0.BF) 63381: Merged V4.2.1 (4.2.1) to HEAD-BUG-FIX (4.3.0.BF) 63200: Merged DEV to V4.2.1 (4.2.1) 63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect' Fixed the AliasableAspectPatch to run in read-only mode. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/admin/patch/impl/AliasableAspectPatch.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java index 5e1b275196..b8867d0eac 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2010 Alfresco Software Limited. * * This file is part of Alfresco * @@ -32,7 +32,6 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.patch.PatchDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.policy.BehaviourFilter; -import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.service.cmr.attributes.AttributeService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; @@ -115,14 +114,9 @@ public class AliasableAspectPatch extends AbstractPatch } }; - RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper(); - // Configure the helper to run in read-only mode - // MNT-10764 - txnHelper.setForceWritable(true); - BatchProcessor batchProcessor = new BatchProcessor( "AliasableAspectPatch", - txnHelper, + transactionService.getRetryingTransactionHelper(), workProvider, batchThreads, batchSize,