From c02f02bf6936fa9fbd6e7c6629800578b412ecbd Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 12 May 2014 16:01:06 +0000 Subject: [PATCH] ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 70083: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 70071: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 70057: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9) 70048: Revised fix for MNT-11107 Documents uploaded by another user are not filtered via tags in My Files Fix for MNT-11427 Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502 - move defining into same TX as shared when shared created. - fix tests that assumes there will never be ACL dupes when traversing the tx change log - incorrect. We aim to minimise this git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/domain/permissions/AclDAOImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java index b78fd3c232..55959d458f 100644 --- a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java @@ -1156,8 +1156,7 @@ public class AclDAOImpl implements AclDAO inheritedAclId = acl.getId(); } - // Does not cause the change set to change - //acl.setAclChangeSetId(getCurrentChangeSetId()); + acl.setAclChangeSetId(getCurrentChangeSetId()); aclCrudDAO.updateAcl(acl); return inheritedAclId; }