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

Breaking up some long lines to facilitate debugging.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-02-08 14:48:57 +00:00
parent cc503b2ac8
commit 1c0c31e10e
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/admin/patch/impl/PermissionDataPatch.java
View File

@@ -85,7 +85,9 @@ public class PermissionDataPatch extends AbstractPatch
ref.setName(name); ref.setName(name);
// it acts as its own key // it acts as its own key
PermissionReference found = (PermissionReference) getHibernateTemplate().get(PermissionReferenceImpl.class, ref); PermissionReference found = (PermissionReference) getHibernateTemplate().get(
PermissionReferenceImpl.class,
ref);
if (found == null) if (found == null)
{ {

11
source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
View File

@@ -56,8 +56,9 @@ import org.springframework.beans.factory.InitializingBean;
*/ */
public class PermissionServiceImpl implements PermissionServiceSPI, InitializingBean public class PermissionServiceImpl implements PermissionServiceSPI, InitializingBean
{ {
static SimplePermissionReference OLD_ALL_PERMISSIONS_REFERENCE = new SimplePermissionReference(QName.createQName( static SimplePermissionReference OLD_ALL_PERMISSIONS_REFERENCE = new SimplePermissionReference(
NamespaceService.SECURITY_MODEL_1_0_URI, PermissionService.ALL_PERMISSIONS), PermissionService.ALL_PERMISSIONS); QName.createQName(NamespaceService.SECURITY_MODEL_1_0_URI, PermissionService.ALL_PERMISSIONS),
PermissionService.ALL_PERMISSIONS);
private static Log log = LogFactory.getLog(PermissionServiceImpl.class); private static Log log = LogFactory.getLog(PermissionServiceImpl.class);
@@ -381,7 +382,11 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
QName typeQname = nodeService.getType(nodeRef); QName typeQname = nodeService.getType(nodeRef);
Set<QName> aspectQNames = nodeService.getAspects(nodeRef); Set<QName> aspectQNames = nodeService.getAspects(nodeRef);
NodeTest nt = new NodeTest(perm.equals(OLD_ALL_PERMISSIONS_REFERENCE) ? getAllPermissionReference() : perm, typeQname, aspectQNames); if (perm.equals(OLD_ALL_PERMISSIONS_REFERENCE))
{
perm = getAllPermissionReference();
}
NodeTest nt = new NodeTest(perm, typeQname, aspectQNames);
boolean result = nt.evaluate(authorisations, nodeRef); boolean result = nt.evaluate(authorisations, nodeRef);
if (log.isDebugEnabled()) if (log.isDebugEnabled())
{ {