From f29b9e84f2993cbd40001418ac5bc3eed1534dab Mon Sep 17 00:00:00 2001
From: Chatura Dilan Perera <dilan@dilan.me>
Date: Wed, 31 Aug 2016 13:56:59 +0530
Subject: [PATCH] Fixed 200 returns when activities are empty and since is a
 future date

---
 .../mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9b0c4e9975b..6ef0a8664d9 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
@@ -122,7 +122,7 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
             int count = dmService.getActivityCountUpdatedAfter(timestamp);
             activityList.setCount(count);
             if (activities == null || activities.size() == 0) {
-                if (isIfModifiedSinceSet || isSinceSet) {
+                if (isIfModifiedSinceSet) {
                     return Response.notModified().build();
                 }
             }