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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68154: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67808: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         67666: Fix formatting issues found during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:19:11 +00:00
parent dbc38d4879
commit eb0220cb38
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -1316,8 +1316,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
* Return the system container for the specified assoc name. * Return the system container for the specified assoc name.
* The containers are cached in a thread safe Tenant aware cache. * The containers are cached in a thread safe Tenant aware cache.
* *
* @param assocQName
*
* @return System container, <b>which must exist</b> * @return System container, <b>which must exist</b>
*/ */
private NodeRef getSystemContainer(QName assocQName) private NodeRef getSystemContainer(QName assocQName)
@@ -1556,8 +1554,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
public void onUpdateProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after) public void onUpdateProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
{ {
boolean isAuthority = dictionaryService.isSubClass(nodeService.getType(nodeRef), boolean isAuthority = dictionaryService.isSubClass(nodeService.getType(nodeRef), ContentModel.TYPE_AUTHORITY_CONTAINER);
ContentModel.TYPE_AUTHORITY_CONTAINER);
QName idProp = isAuthority ? ContentModel.PROP_AUTHORITY_NAME : ContentModel.PROP_USERNAME; QName idProp = isAuthority ? ContentModel.PROP_AUTHORITY_NAME : ContentModel.PROP_USERNAME;
String authBefore = DefaultTypeConverter.INSTANCE.convert(String.class, before.get(idProp)); String authBefore = DefaultTypeConverter.INSTANCE.convert(String.class, before.get(idProp));
if (authBefore == null) if (authBefore == null)
@@ -1728,9 +1725,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
} }
} }
/* (non-Javadoc)
* @see org.alfresco.repo.cache.RefreshableCacheListener#onRefreshableCacheEvent(org.alfresco.repo.cache.RefreshableCacheEvent)
*/
@Override @Override
public void onRefreshableCacheEvent(RefreshableCacheEvent refreshableCacheEvent) public void onRefreshableCacheEvent(RefreshableCacheEvent refreshableCacheEvent)
{ {
@@ -1741,20 +1735,12 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
userAuthorityCache.clear(); userAuthorityCache.clear();
} }
/* (non-Javadoc)
* @see org.alfresco.repo.cache.RefreshableCacheListener#getCacheId()
*/
@Override @Override
public String getCacheId() public String getCacheId()
{ {
return AuthorityDAOImpl.class.getName(); return AuthorityDAOImpl.class.getName();
} }
/* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override @Override
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {