From 08f8ed2feb81723b717dd173e0db30d7de32b9cd Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Wed, 7 Aug 2019 19:21:46 +0300 Subject: [PATCH] Claim device improvements (#1913) * add-device-to-claim-result * code update * code-update * added-condition-on-empty-cache-clause * remove empty row * update code --- .../server/dao/device/ClaimDevicesServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java index 1a33f26d7b..9c6e754bdd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesServiceImpl.java @@ -112,14 +112,14 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService { 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(device, ClaimResponse.CLAIMED)); + return Futures.transform(removeClaimingSavedData(cache, key, device), result -> new ClaimResult(null, ClaimResponse.CLAIMED)); } } else { log.warn("Failed to find the device's claiming message![{}]", device.getName()); 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)); + return Futures.immediateFuture(new ClaimResult(null, ClaimResponse.CLAIMED)); } } }