Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59258: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
              was being used in later versions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:21:30 +00:00
parent 8d76c8edf7
commit b5e03702c7

View File

@@ -1463,6 +1463,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
{
throw new SiteServiceException(MSG_CAN_NOT_DELETE, new Object[]{shortName});
}
final QName siteType = this.directNodeService.getType(siteNodeRef);
// Delete the cached reference
siteNodeRefCache.remove(shortName);