From b1d95af5b05f4d2b29a0a94c82727c11dbd58828 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Fri, 20 Nov 2020 23:37:48 +0530
Subject: [PATCH] remvoing restriction that prevents activity count to be
 returned when if-modified-since header is present

---
 .../service/impl/ActivityProviderServiceImpl.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
index d115659e18..ed4d4edd05 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
@@ -298,11 +298,11 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
                 }
                 activityList.setList(activities);
                 activityList.setCount(count);
-                if (activities == null || activities.size() == 0) {
-                    if (isIfModifiedSinceSet) {
-                        return Response.notModified().build();
-                    }
-                }
+//                if (activities == null || activities.size() == 0) {
+//                    if (isIfModifiedSinceSet) {
+//                        return Response.notModified().build();
+//                    }
+//                }
                 return Response.ok().entity(activityList).build();
             } catch (OperationManagementException e) {
                 String msg