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

ALF-16669: removing a site member may break the activity feed

Browse Source 
- fallout from r34698 - perf' improvement to prevent unnecessary 304 revalidation requests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2012-11-08 09:38:43 +00:00
parent d799210bd1
commit 72bef82fc6
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
View File

@@ -21,7 +21,6 @@ package org.alfresco.repo.activities;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -40,15 +39,14 @@ import org.alfresco.service.cmr.activities.ActivityPostService;
import org.alfresco.service.cmr.activities.ActivityService; import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl; import org.alfresco.service.cmr.activities.FeedControl;
import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.NoSuchPersonException;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONException; import org.json.JSONException;
@@ -304,32 +302,40 @@ public class ActivityServiceImpl implements ActivityService, InitializingBean
// activity posting user avatars will be retrieved and added to the activity feed. This will enable // activity posting user avatars will be retrieved and added to the activity feed. This will enable
// avatars to be requested using the unique nodeRef which can be safely cached by the browser and // avatars to be requested using the unique nodeRef which can be safely cached by the browser and
// improve performance... // improve performance...
if (userIdToAvatarNodeRefCache.containsKey(activityFeed.getPostUserId())) NodeRef avatarNodeRef = null;
String postUserId = activityFeed.getPostUserId();
if (userIdToAvatarNodeRefCache.containsKey(postUserId))
{ {
// If we've previously cached the users avatar, or if we've determine that the user doesn't // If we've previously cached the users avatar, or if we've determine that the user doesn't
// have an avatar then use the cached data. // have an avatar then use the cached data.
activityFeed.setPostUserAvatarNodeRef(userIdToAvatarNodeRefCache.get(activityFeed.getPostUserId())); avatarNodeRef = userIdToAvatarNodeRefCache.get(postUserId);
} }
else else
{ {
// Get the avatar for the user id, set it in the activity feed and update the cache try
NodeRef avatarNodeRef = null;
NodeRef postPerson = this.personService.getPerson(activityFeed.getPostUserId());
List<AssociationRef> assocRefs = this.nodeService.getTargetAssocs(postPerson, ContentModel.ASSOC_AVATAR);
if (!assocRefs.isEmpty())
{ {
avatarNodeRef = assocRefs.get(0).getTargetRef(); NodeRef postPerson = this.personService.getPerson(postUserId);
activityFeed.setPostUserAvatarNodeRef(avatarNodeRef); List<AssociationRef> assocRefs = this.nodeService.getTargetAssocs(postPerson, ContentModel.ASSOC_AVATAR);
if (!assocRefs.isEmpty())
{
// Get the avatar for the user id, set it in the activity feed and update the cache
avatarNodeRef = assocRefs.get(0).getTargetRef();
}
} }
else catch (NoSuchPersonException e)
{ {
activityFeed.setPostUserAvatarNodeRef(null); if (logger.isDebugEnabled())
{
logger.warn("getUserFeedEntries: person no longer exists: "+postUserId);
}
} }
// Update the cache (setting null if there is no avatar for the user)... // Update the cache (setting null if there is no avatar for the user)...
userIdToAvatarNodeRefCache.put(activityFeed.getPostUserId(), avatarNodeRef); userIdToAvatarNodeRefCache.put(postUserId, avatarNodeRef);
} }
activityFeed.setPostUserAvatarNodeRef(avatarNodeRef);
activityFeed.setSiteNetwork(tenantService.getBaseName(activityFeed.getSiteNetwork())); activityFeed.setSiteNetwork(tenantService.getBaseName(activityFeed.getSiteNetwork()));
result.add(activityFeed); result.add(activityFeed);
} }