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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
74282: Removed unused and untested bridge table options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:33:55 +00:00
parent e9f9812165
commit 732b8a48e0
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
View File

@@ -131,8 +131,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
private boolean useBridgeTable = true; private boolean useBridgeTable = true;
private boolean useGetContainingAuthoritiesForIsAuthorityContained = true;
private QNameDAO qnameDAO; private QNameDAO qnameDAO;
private CannedQueryDAO cannedQueryDAO; private CannedQueryDAO cannedQueryDAO;
private AclDAO aclDao; private AclDAO aclDao;
@@ -261,14 +259,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
this.cannedQueryRegistry = cannedQueryRegistry; this.cannedQueryRegistry = cannedQueryRegistry;
} }
/**
* @param useGetContainingAuthoritiesForHasAuthority the useGetContainingAuthoritiesForHasAuthority to set
*/
public void setUseGetContainingAuthoritiesForIsAuthorityContained(boolean useGetContainingAuthoritiesForIsAuthorityContained)
{
this.useGetContainingAuthoritiesForIsAuthorityContained = useGetContainingAuthoritiesForIsAuthorityContained;
}
/** /**
* @param authorityBridgeDAO the authorityBridgeDAO to set * @param authorityBridgeDAO the authorityBridgeDAO to set
*/ */
@@ -1157,16 +1147,9 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
negativeHits.add(getPooledName(authority)); negativeHits.add(getPooledName(authority));
return false; return false;
} }
if(useGetContainingAuthoritiesForIsAuthorityContained) if (authorityBridgeTableCache.isUpToDate())
{ {
if(authorityBridgeTableCache.isUpToDate()) return getContainingAuthorities(null, authorityToFind, false).contains(authority);
{
return getContainingAuthorities(null, authorityToFind, false).contains(authority);
}
else
{
return isAuthorityContained(authorityNodeRef, getPooledName(authority), authorityToFind, positiveHits, negativeHits);
}
} }
else else
{ {

12
source/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
View File

@@ -73,23 +73,11 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
private Set<String> adminGroups = Collections.emptySet(); private Set<String> adminGroups = Collections.emptySet();
private Set<String> guestGroups = Collections.emptySet(); private Set<String> guestGroups = Collections.emptySet();
private boolean useGetContainingAuthoritiesForHasAuthority = true;
public AuthorityServiceImpl() public AuthorityServiceImpl()
{ {
super(); super();
} }
/**
* @param useGetContainingAuthoritiesForHasAuthority the useGetContainingAuthoritiesForHasAuthority to set
*/
public void setUseGetContainingAuthoritiesForHasAuthority(boolean useGetContainingAuthoritiesForHasAuthority)
{
this.useGetContainingAuthoritiesForHasAuthority = useGetContainingAuthoritiesForHasAuthority;
}
public void setTenantService(TenantService tenantService) public void setTenantService(TenantService tenantService)
{ {
this.tenantService = tenantService; this.tenantService = tenantService;