diff --git a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java index ba20a7e97b..c0f34f4fa0 100644 --- a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java +++ b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2012 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -371,7 +371,7 @@ public abstract class FeedTaskProcessor { try { - followerUsers = getFollowers(postUserId, tenantDomain); + followerUsers = getFollowers(ctx, postUserId, tenantDomain); } catch(Exception e) { @@ -525,7 +525,7 @@ public abstract class FeedTaskProcessor return members; } - protected abstract Set getFollowers(String userId, String tenantDomain) throws Exception; + protected abstract Set getFollowers(RepoCtx ctx, String userId, String tenantDomain) throws Exception; protected abstract boolean canReadSite(final RepoCtx ctx, String siteIdIn, String connectedUser, final String tenantDomain) throws Exception; protected abstract boolean canRead(RepoCtx ctx, final String connectedUser, Map model) throws Exception; diff --git a/source/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java b/source/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java index c8d2594f16..2c5d329f06 100644 --- a/source/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java +++ b/source/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -600,7 +600,7 @@ public class LocalFeedTaskProcessor extends FeedTaskProcessor implements Applica return documentPaths; } - protected Set getFollowers(final String userId, String tenantDomain) throws Exception + protected Set getFollowers(final RepoCtx ctx, final String userId, String tenantDomain) throws Exception { if (useRemoteCallbacks) { @@ -620,7 +620,14 @@ public class LocalFeedTaskProcessor extends FeedTaskProcessor implements Applica if (fr.getPage() != null) { - result.addAll(fr.getPage()); + for (String followerUserName : fr.getPage()) + { + if (!ctx.isUserNamesAreCaseSensitive()) + { + followerUserName = followerUserName.toLowerCase(); + } + result.add(followerUserName); + } } return null;