From b5e03702c7fbfea6de55c37455ae35ab2f0f0053 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 01:21:30 +0000 Subject: [PATCH] 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 --- source/java/org/alfresco/repo/site/SiteServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 327f462c6b..4383d5d489 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -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);