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

Added proper hanling of null values for provision device key

Browse Source
This commit is contained in:
Volodymyr Babak 2021-08-02 14:55:43 +03:00
parent 414087c090
commit d95c2b88b0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
View File

@ -61,7 +61,9 @@ public class DeviceProfileMsgConstructor {
if (deviceProfile.getProvisionType() != null) { if (deviceProfile.getProvisionType() != null) {
builder.setProvisionType(getStringValue(deviceProfile.getProvisionType().name())); builder.setProvisionType(getStringValue(deviceProfile.getProvisionType().name()));
} }
builder.setProvisionDeviceKey(getStringValue(deviceProfile.getProvisionDeviceKey())); if (deviceProfile.getProvisionDeviceKey() != null) {
builder.setProvisionDeviceKey(getStringValue(deviceProfile.getProvisionDeviceKey()));
}
if (deviceProfile.getImage() != null) { if (deviceProfile.getImage() != null) {
builder.setImage(getBytesValue(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8)))); builder.setImage(getBytesValue(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8))));
} }