From 5331b3925da1896517ba9fa2c68847ab9c632aa7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 7 Feb 2015 10:32:52 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    96473:
 Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)       96360: Merged
 V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)          96323: Reverse Merge
 V4.2-BUG-FIX (4.2.5)             << Reverted as build has been broken for 4
 days >>             95704: Merged DEV to V4.2-BUG-FIX (4.2.5)               
 94398: MNT-13234 : Duplicate activities in activities feed                  
 - Changed getFollowers() method with implementing username case sensitive
 specific, like it done in getSiteMembers() method.                94483:
 MNT-13234: Duplicate activities in activities feed                   - Added
 test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/activities/feed/FeedTaskProcessor.java     |  6 +++---
 .../feed/local/LocalFeedTaskProcessor.java          | 13 +++----------
 2 files changed, 6 insertions(+), 13 deletions(-)

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