Browse Source

Avoided additional info creation on provisioning if the device is not a gateway

pull/11341/head
imbeacon 2 years ago
parent
commit
aeec020f6a
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java

4
dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java

@ -556,11 +556,11 @@ public class DeviceServiceImpl extends CachedVersionedEntityService<DeviceCacheK
device.setName(provisionRequest.getDeviceName()); device.setName(provisionRequest.getDeviceName());
device.setType(profile.getName()); device.setType(profile.getName());
device.setTenantId(profile.getTenantId()); device.setTenantId(profile.getTenantId());
ObjectNode additionalInfoNode = JacksonUtil.newObjectNode();
if (provisionRequest.getGateway() != null && provisionRequest.getGateway()) { if (provisionRequest.getGateway() != null && provisionRequest.getGateway()) {
ObjectNode additionalInfoNode = JacksonUtil.newObjectNode();
additionalInfoNode.put(DataConstants.GATEWAY_PARAMETER, true); additionalInfoNode.put(DataConstants.GATEWAY_PARAMETER, true);
device.setAdditionalInfo(additionalInfoNode);
} }
device.setAdditionalInfo(additionalInfoNode);
Device savedDevice = saveDevice(device); Device savedDevice = saveDevice(device);
if (!StringUtils.isEmpty(provisionRequest.getCredentialsData().getToken()) || if (!StringUtils.isEmpty(provisionRequest.getCredentialsData().getToken()) ||
!StringUtils.isEmpty(provisionRequest.getCredentialsData().getX509CertHash()) || !StringUtils.isEmpty(provisionRequest.getCredentialsData().getX509CertHash()) ||

Loading…
Cancel
Save