SAIL-373 (SAIL-294): Fix ACL update entity - fix PersonTest.testCreateMissingPeople after r20931 (which enabled the shared ACL entity cache)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-07-07 12:54:55 +00:00
parent 839f421e5f
commit a612271e6b
5 changed files with 56 additions and 19 deletions

View File

@@ -35,6 +35,7 @@ import org.alfresco.repo.domain.avm.AVMStoreDAO;
import org.alfresco.repo.domain.patch.PatchDAO;
import org.alfresco.repo.domain.permissions.AclCrudDAO;
import org.alfresco.repo.domain.permissions.AclEntity;
import org.alfresco.repo.domain.permissions.AclUpdateEntity;
import org.alfresco.repo.domain.permissions.Authority;
import org.alfresco.repo.domain.permissions.Permission;
import org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor.StoreType;
@@ -1058,14 +1059,14 @@ public class ResetWCMToGroupBasedPermissionsPatch extends MoveWCMToGroupBasedPer
private void updateAclInheritsFrom(final long aclId, final long inheritsFromId) throws Exception
{
AclEntity aclEntity = aclCrudDAO.getAclForUpdate(aclId);
AclUpdateEntity aclEntity = aclCrudDAO.getAclForUpdate(aclId);
aclEntity.setInheritsFrom(inheritsFromId);
aclCrudDAO.updateAcl(aclEntity);
}
private void updateAclInherited(final long aclId, final long inheritedAclId) throws Exception
{
AclEntity aclEntity = aclCrudDAO.getAclForUpdate(aclId);
AclUpdateEntity aclEntity = aclCrudDAO.getAclForUpdate(aclId);
aclEntity.setInheritedAcl(inheritedAclId);
aclCrudDAO.updateAcl(aclEntity);
}