From 00dbf5f7910d7f1c4e806cfd7b2adb75e65dae24 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 23:26:54 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 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 --- .../permissions/impl/model/PermissionModel.java | 14 ++++++++------ .../org/alfresco/repo/avm/AVMTestSuite.java | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java index 06c2067080..5a6351dcf4 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java @@ -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; diff --git a/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java b/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java index d5495f3d07..56cf7b9959 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java +++ b/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java @@ -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(