From 3f7a1edde6c4c4db9ea8c9f9136b531f70da1b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BC?= <fmui@apache.org>
Date: Tue, 12 Jul 2011 11:40:59 +0000
Subject: [PATCH] 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
---
 .../alfresco/repo/activities/ActivityServiceImpl.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
index 85f0582973..a4e794035a 100644
--- a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
+++ b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
@@ -235,6 +235,16 @@ public class ActivityServiceImpl implements ActivityService, InitializingBean
         
         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
         {
             if (siteId != null)