Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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();
                 }
             }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -51,6 +51,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -128,7 +129,9 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                 request.setSince(sinceDate);
                 result = dms.getAllDevices(request);
                 if (result == null || result.getData() == null || result.getData().size() <= 0) {
-                    return Response.status(Response.Status.OK).entity(new JsonArray()).build();
+                    devices.setList(new ArrayList<Device>());
+                    devices.setCount(0);
+                    return Response.status(Response.Status.OK).entity(devices).build();
                 }
             } else {
                 result = dms.getAllDevices(request);