From 2ff1272a28a3ee3703745d4935bc58e3e51f18a3 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 23 Jul 2014 15:41:36 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    77129:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       73474:
 ACE-1685: aclsReaders.post WebScript now includes denied authorities in
 results

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/solr/AclReaders.java    | 11 ++++++++++-
 .../alfresco/repo/solr/SOLRTrackingComponentImpl.java |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/solr/AclReaders.java b/source/java/org/alfresco/repo/solr/AclReaders.java
index 93cd721040..93275d0a1e 100644
--- a/source/java/org/alfresco/repo/solr/AclReaders.java
+++ b/source/java/org/alfresco/repo/solr/AclReaders.java
@@ -32,13 +32,14 @@ public class AclReaders
 {
     private Long aclId;
     private Set<String> readers;
+    private Set<String> denied;    
     private long aclChangeSetId;
     private String tenantDomain = TenantService.DEFAULT_DOMAIN;
     
     @Override
     public String toString()
     {
-        return "AclReaders [aclId=" + aclId + ", readers=" + readers + ", aclChangeSetId=" + aclChangeSetId + ", tenantDomain=" + tenantDomain + "]";
+        return "AclReaders [aclId=" + aclId + ", readers=" + readers + ", denied=" + denied + ", aclChangeSetId=" + aclChangeSetId + ", tenantDomain=" + tenantDomain + "]";
     }
     public Long getAclId()
     {
@@ -56,6 +57,14 @@ public class AclReaders
     {
         this.readers = aclReaders;
     }
+    public Set<String> getDenied()
+    {
+        return denied;
+    }
+    public void setDenied(Set<String> denied)
+    {
+        this.denied = denied;
+    }
     public long getAclChangeSetId()
     {
         return aclChangeSetId;
diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
index a18da63ac0..6b96028edd 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
@@ -257,10 +257,12 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
             List<AclReaders> aclsReaders = new ArrayList<AclReaders>(aclIds.size() * 10);
             for (Long aclId : aclIds)
             {
-                Set<String> readersSet = permissionService.getReaders(aclId);
                 AclReaders readers = new AclReaders();
                 readers.setAclId(aclId);
+                Set<String> readersSet = permissionService.getReaders(aclId);
                 readers.setReaders(readersSet);
+                Set<String> deniedSet = permissionService.getReadersDenied(aclId);
+                readers.setDenied(deniedSet);
                 
                 Long aclChangeSetId = aclDAO.getAccessControlList(aclId).getProperties().getAclChangeSetId();
                 readers.setAclChangeSetId(aclChangeSetId);