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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
57055: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56523: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56443: (MNT-9756) ALF-19225: Made post feeds cleanup to be executed in the unit test tear down method, to clean Pending, Error and etc. feeds.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:03:22 +00:00
parent 7b0bd9b5dd
commit 5e2c285efd
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
View File

@@ -37,7 +37,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import org.alfresco.repo.activities.post.lookup.PostLookup;
import org.alfresco.repo.domain.activities.ActivityFeedDAO;
@@ -134,7 +133,7 @@ public abstract class FeedTaskProcessor
}
catch(JSONException je)
{
logger.error("Skipping activity post " + activityPost.getId() + " due to invalid activity data: " + je);
logger.error("Skipping activity post " + activityPost.getId() + " due to invalid activity data: ", je);
updatePostStatus(activityPost.getId(), ActivityPostEntity.STATUS.ERROR);
continue;
}
@@ -195,7 +194,7 @@ public abstract class FeedTaskProcessor
}
catch (Exception e)
{
logger.error("Skipping activity post " + activityPost.getId() + " since failed to get recipients: " + e);
logger.error("Skipping activity post " + activityPost.getId() + " since failed to get recipients: ", e);
updatePostStatus(activityPost.getId(), ActivityPostEntity.STATUS.ERROR);
continue;
}