From 786e58f936499fb0ebd91ca9392b456e47fa18d3 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 10:43:58 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    89911:
 Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)       89768: Merged
 DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)          88903: MNT-12500: Cloud Sync:
 Sync fails when Editing Online          Added disabling of
 LockableAspectInterceptor together with lockable aspect.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/lock/LockServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/java/org/alfresco/repo/lock/LockServiceImpl.java b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
index 66094d8585..9ae7dea6fb 100644
--- a/source/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -805,12 +805,14 @@ public class LockServiceImpl implements LockService,
     public void suspendLocks()
     {
        getBehaviourFilter().disableBehaviour(ContentModel.ASPECT_LOCKABLE);
+       lockableAspectInterceptor.disableForThread();
     }
     
     @Override
     public void enableLocks()
     {
        getBehaviourFilter().enableBehaviour(ContentModel.ASPECT_LOCKABLE);
+       lockableAspectInterceptor.enableForThread();
     }
 
     @Override