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

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

Browse Source 
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
This commit is contained in:
Alan Davis
2015-01-31 10:43:58 +00:00
parent 1ceaa86654
commit 786e58f936
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/lock/LockServiceImpl.java
View File

@@ -805,12 +805,14 @@ public class LockServiceImpl implements LockService,
public void suspendLocks() public void suspendLocks()
{ {
getBehaviourFilter().disableBehaviour(ContentModel.ASPECT_LOCKABLE); getBehaviourFilter().disableBehaviour(ContentModel.ASPECT_LOCKABLE);
lockableAspectInterceptor.disableForThread();
} }
@Override @Override
public void enableLocks() public void enableLocks()
{ {
getBehaviourFilter().enableBehaviour(ContentModel.ASPECT_LOCKABLE); getBehaviourFilter().enableBehaviour(ContentModel.ASPECT_LOCKABLE);
lockableAspectInterceptor.enableForThread();
} }
@Override @Override