mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Avoid exceptions if the subscription service is disabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -235,6 +235,16 @@ public class ActivityServiceImpl implements ActivityService, InitializingBean
|
|||||||
|
|
||||||
List<ActivityFeedEntity> result = new ArrayList<ActivityFeedEntity>();
|
List<ActivityFeedEntity> result = new ArrayList<ActivityFeedEntity>();
|
||||||
|
|
||||||
|
// avoid DB calls if filters are empty
|
||||||
|
if(actvityFilter != null && actvityFilter.isEmpty())
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
if(userFilter != null && userFilter.isEmpty())
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (siteId != null)
|
if (siteId != null)
|
||||||
|
Reference in New Issue
Block a user