From 9a1bb97a0c699a9a9b9a1374b7f97745ea484806 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 17:06:49 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63904: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF) 63830: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2) 63743: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9) 63678: Merged DEV to PATCHES/V4.1.8 (4.1.8) 63659 : MNT-10836 : Created site isn't present on My Sites dashlet - We should make additional check for site existence while listing user's sites as ACL may still exists while site was removed (in trashcan). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/site/SiteServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index c96c5790a2..b6600e41b4 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -1073,7 +1073,8 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic if (siteNames.size() < maxResults) { String siteName = resolveSite(authority); - if (siteName == null) + // MNT-10836 fix, after MNT-10109 we should also check site existence + if (siteName == null || getSite(siteName) == null) { return false; }