From 5adf37ba71bb67eed432cfb1f3fca3ce076309df Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 1 Jul 2014 15:32:27 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    75092:
 Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       74393: Removed the
 extra step when posting activities, its now enhanced from the queue.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../default/activities-feed-context.xml         |  1 -
 .../activities/ActivityPostServiceImpl.java     | 17 +++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml b/config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
index c89667eed3..391a463c2d 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
@@ -10,7 +10,6 @@
       <property name="tenantService" ref="tenantService"/>
       <property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
       <property name="eventPublisher" ref="eventPublisher" />
-      <property name="fileFolderService" ref="FileFolderService"/>
    </bean>
    
    <bean id="activityService" class="org.alfresco.repo.activities.ActivityServiceImpl">
diff --git a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
index 51f1723c91..f7e1fd7222 100644
--- a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
+++ b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
@@ -32,7 +32,6 @@ import org.alfresco.repo.events.EventPublisher;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.activities.ActivityPostService;
-import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -58,7 +57,6 @@ public class ActivityPostServiceImpl implements ActivityPostService
     private ActivityPostDAO postDAO;
     private TenantService tenantService;
     private EventPublisher eventPublisher;
-    private FileFolderService fileFolderService;
     
     private int estGridSize = 1;
     
@@ -89,10 +87,6 @@ public class ActivityPostServiceImpl implements ActivityPostService
         this.eventPublisher = eventPublisher;
     }
 
-    public void setFileFolderService(FileFolderService fileFolderService)
-    {
-        this.fileFolderService = fileFolderService;
-    }
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.activities.ActivityService#postActivity(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
      */
@@ -297,15 +291,14 @@ public class ActivityPostServiceImpl implements ActivityPostService
                     String nodeId = finalNodeRef!=null?finalNodeRef.getId():null;
                     FileInfo fileInfo = contentNodeInfo;
                     
-                    //Get content info if available
-                    if (fileInfo == null && finalNodeRef !=null)
-                    {
-                        fileInfo = fileFolderService.getFileInfo(finalNodeRef);
-                    }
-                    
                     //Use content info
                     if (fileInfo != null)
                     {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Enhancing the Activity Event with fileInfo provided for node "+nodeId);
+                        }
+                        
                         if (nodeId == null)
                         {
                             nodeId = fileInfo.getNodeRef().getId();