dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Claim device improvements (#1913)

Browse Source 
* add-device-to-claim-result

* code update

* code-update

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

* remove empty row

* update code
This commit is contained in:
ShvaykaD 2019-08-07 19:21:46 +03:00 committed by Andrew Shvayka
parent d1c89fe150
commit 08f8ed2feb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java
View File

@ -112,14 +112,14 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
Device savedDevice = deviceService.saveDevice(device); Device savedDevice = deviceService.saveDevice(device);
return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(savedDevice, ClaimResponse.SUCCESS)); return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(savedDevice, ClaimResponse.SUCCESS));
} }
return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(device, ClaimResponse.CLAIMED)); return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(null, ClaimResponse.CLAIMED));
} }
} else { } else {
log.warn("Failed to find the device's claiming message![{}]", device.getName()); log.warn("Failed to find the device's claiming message![{}]", device.getName());
if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) { if(device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE)); return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.FAILURE));
} else { } else {
return Futures.immediateFuture(new ClaimResult(device, ClaimResponse.CLAIMED)); return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED));
} }
} }
} }