diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java index 0033055706..c2a2a668cc 100644 --- a/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java +++ b/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java @@ -131,8 +131,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor private boolean useBridgeTable = true; - private boolean useGetContainingAuthoritiesForIsAuthorityContained = true; - private QNameDAO qnameDAO; private CannedQueryDAO cannedQueryDAO; private AclDAO aclDao; @@ -261,14 +259,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor this.cannedQueryRegistry = cannedQueryRegistry; } - /** - * @param useGetContainingAuthoritiesForHasAuthority the useGetContainingAuthoritiesForHasAuthority to set - */ - public void setUseGetContainingAuthoritiesForIsAuthorityContained(boolean useGetContainingAuthoritiesForIsAuthorityContained) - { - this.useGetContainingAuthoritiesForIsAuthorityContained = useGetContainingAuthoritiesForIsAuthorityContained; - } - /** * @param authorityBridgeDAO the authorityBridgeDAO to set */ @@ -1157,16 +1147,9 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor negativeHits.add(getPooledName(authority)); return false; } - if(useGetContainingAuthoritiesForIsAuthorityContained) + if (authorityBridgeTableCache.isUpToDate()) { - if(authorityBridgeTableCache.isUpToDate()) - { - return getContainingAuthorities(null, authorityToFind, false).contains(authority); - } - else - { - return isAuthorityContained(authorityNodeRef, getPooledName(authority), authorityToFind, positiveHits, negativeHits); - } + return getContainingAuthorities(null, authorityToFind, false).contains(authority); } else { diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java b/source/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java index 0b70f7f020..7b7dbe81a1 100644 --- a/source/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java +++ b/source/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java @@ -73,23 +73,11 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean private Set adminGroups = Collections.emptySet(); private Set guestGroups = Collections.emptySet(); - private boolean useGetContainingAuthoritiesForHasAuthority = true; - public AuthorityServiceImpl() { super(); } - /** - * @param useGetContainingAuthoritiesForHasAuthority the useGetContainingAuthoritiesForHasAuthority to set - */ - public void setUseGetContainingAuthoritiesForHasAuthority(boolean useGetContainingAuthoritiesForHasAuthority) - { - this.useGetContainingAuthoritiesForHasAuthority = useGetContainingAuthoritiesForHasAuthority; - } - - - public void setTenantService(TenantService tenantService) { this.tenantService = tenantService;