Merge pull request #659 from sameeragunarathne/master

fixing wso2/product-iots#1136
revert-70aa11f8
Geeth 7 years ago committed by GitHub
commit cc3706fc4a

@ -92,7 +92,7 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
operations = this.getValidOperationNames(); //list operations for each device type
devices = deviceManagementProviderService.getAllDevices(deviceType, false);//list devices for each type
if (!devices.isEmpty()) {
if (operations != null) {
if (operations != null && DeviceManagerUtil.getValidDeviceIdentifiers(devices).size() != 0) {
for (String str : operations) {
CommandOperation operation = new CommandOperation();
operation.setEnabled(true);

@ -247,6 +247,7 @@ public final class DeviceManagerUtil {
switch (device.getEnrolmentInfo().getStatus()) {
case BLOCKED:
case REMOVED:
break;
case SUSPENDED:
break;
default:

Loading…
Cancel
Save