From b1396566208ab658fabf222a3502c60f387e3244 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 22 Jul 2014 13:51:39 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    76028:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)       75739: Merged
 DEV to V4.2-BUG-FIX (4.2.3)          71980 : MNT-11362 : Cloud - Manage Sites
 feature not showing results if a site in the list is corrupt             -
 Check if containing authority exists

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/site/SiteServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 8d0b01405c..ef531f75f3 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -1733,9 +1733,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
         
         for (String permission : permissions)
         {
-            if (roleFilter == null || roleFilter.length() == 0 || roleFilter.equals(permission))
+            String groupName = getSiteRoleGroup(shortName, permission, true);
+            
+            if ((roleFilter == null || roleFilter.length() == 0 || roleFilter.equals(permission)) && this.authorityService.authorityExists(groupName))
             {
-                String groupName = getSiteRoleGroup(shortName, permission, true);
                 Set<String> authorities = this.authorityService.getContainedAuthorities(null, groupName, true);
                 for (String authority : authorities)
                 {