ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

70000: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69998: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69997: MNT-11437: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            69995: Revised fix for     MNT-11107  Documents uploaded by another user are not filtered via tags in My Files
            Fix for     MNT-11427  Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502
            - fixed as described - no complex join - pull back and check inherited shared are indexed when the defining acls is indexed if it exists
            - will also be indexed if created lazily


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/solr/AclEntity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -29,22 +29,21 @@ import org.alfresco.repo.solr.Acl;
 public class AclEntity implements Acl
 {
     private Long id;
+    private Long inheritedId;
     private Long aclChangeSetId;
 
     @Override
     public String toString()
     {
-        return "AclEntity " +
-        		"[id=" + id +
-                ", aclChangeSetId=" + aclChangeSetId +
-        		"]";
+        return "AclEntity [id=" + id + ", inheritedId=" + inheritedId + ", aclChangeSetId=" + aclChangeSetId + "]";
     }
-
+    
     @Override
     public Long getId()
     {
         return id;
     }
+    
     public void setId(Long id)
     {
         this.id = id;
@@ -59,4 +58,15 @@ public class AclEntity implements Acl
     {
         this.aclChangeSetId = aclChangeSetId;
     }
+
+    @Override
+    public Long getInheritedId()
+    {
+        return inheritedId;
+    }
+
+    public void setInheritedId(Long inheritedId)
+    {
+        this.inheritedId = inheritedId;
+    }
 }