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 
58398: Handles null better, and removed applicationContext reference


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:26:54 +00:00
parent 1253d2d40e
commit 00dbf5f791
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
View File

@@ -448,13 +448,15 @@ public class PermissionModel implements ModelDAO
{
ClassDefinition classDefinition = dictionaryService.getClass(pg.getQName());
QName parent;
while ((parent = classDefinition.getParentName()) != null)
{
classDefinition = dictionaryService.getClass(parent);
PermissionGroup attempt = getPermissionGroupOrNull(SimplePermissionReference.getPermissionReference(parent, pg.getName()));
if ((attempt != null) && (!attempt.isExtends()))
if (classDefinition != null) {
while ((parent = classDefinition.getParentName()) != null)
{
return attempt;
classDefinition = dictionaryService.getClass(parent);
PermissionGroup attempt = getPermissionGroupOrNull(SimplePermissionReference.getPermissionReference(parent, pg.getName()));
if ((attempt != null) && (!attempt.isExtends()))
{
return attempt;
}
}
}
return null;

4
source/test-java/org/alfresco/repo/avm/AVMTestSuite.java
View File

@@ -35,8 +35,8 @@ public class AVMTestSuite extends TestSuite
{
public static ApplicationContext getContext()
{
ApplicationContextHelper.setUseLazyLoading(false);
ApplicationContextHelper.setNoAutoStart(true);
//ApplicationContextHelper.setUseLazyLoading(false);
//ApplicationContextHelper.setNoAutoStart(true);
/*
return ApplicationContextHelper.getApplicationContext(