Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements

revert-70aa11f8
geethkokila 8 years ago
commit a67f432993

@ -127,7 +127,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
} else { } else {
result = dms.getAllDevices(request); result = dms.getAllDevices(request);
if (result == null) { int resultCount = result.getRecordsTotal();
if (resultCount == 0) {
throw new NotFoundException( throw new NotFoundException(
new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No device is currently" + new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No device is currently" +
" enrolled with the server").build()); " enrolled with the server").build());

Loading…
Cancel
Save