inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alan Davis
2015-01-31 12:28:57 +00:00
parent 127d6c6ca8
commit 38f8f52bf5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/imap/ImapServiceImpl.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2014 Alfresco Software Limited. * Copyright (C) 2005-2015 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -1435,8 +1435,8 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
if (isImapFavourite != null && isImapFavourite) if (isImapFavourite != null && isImapFavourite)
{ {
String siteName = key.substring(AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES.length() + 1); // count the dot String siteName = key.substring(AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES.length() + 1); // count the dot
boolean isMember = serviceRegistry.getSiteService().isMember(siteName, userName); boolean siteExists = serviceRegistry.getSiteService().getSite(siteName) != null;
if (isMember) if (siteExists && serviceRegistry.getSiteService().isMember(siteName, userName))
{ {
SiteInfo siteInfo = serviceRegistry.getSiteService().getSite(siteName); SiteInfo siteInfo = serviceRegistry.getSiteService().getSite(siteName);
if (siteInfo != null) if (siteInfo != null)