Browse Source

Added condition to response if the cache is empty. (#1912)

* add-device-to-claim-result

* code update

* code-update

* added-condition-on-empty-cache-clause

* remove empty row
pull/1914/head
ShvaykaD 7 years ago
committed by Andrew Shvayka
parent
commit
d1c89fe150
  1. 6
      dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java

6
dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java

@ -116,7 +116,11 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
}
} else {
log.warn("Failed to find the device's claiming message![{}]", device.getName());
return Futures.immediateFuture(new ClaimResult(device, ClaimResponse.CLAIMED));
if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
} else {
return Futures.immediateFuture(new ClaimResult(device, ClaimResponse.CLAIMED));
}
}
}

Loading…
Cancel
Save