From 38f8f52bf593047ceb39b749363465a63f9b7386 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 12:28:57 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 93603: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 93558: MNT-13159: Merged DEV to 5.0.N (5.0.1) 93441: MNT-13159: IMAP Service throws Exception when Fav Site is removed - Add check that favourite site exist git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/imap/ImapServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java index 38b040039f..31a22d379a 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -1435,8 +1435,8 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea if (isImapFavourite != null && isImapFavourite) { String siteName = key.substring(AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES.length() + 1); // count the dot - boolean isMember = serviceRegistry.getSiteService().isMember(siteName, userName); - if (isMember) + boolean siteExists = serviceRegistry.getSiteService().getSite(siteName) != null; + if (siteExists && serviceRegistry.getSiteService().isMember(siteName, userName)) { SiteInfo siteInfo = serviceRegistry.getSiteService().getSite(siteName); if (siteInfo != null)