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

Added proper handle of null additional info

Browse Source
This commit is contained in:
Volodymyr Babak 2021-08-02 13:44:11 +03:00
parent e05e681bd9
commit 94cf676d97
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RelationMsgConstructor.java
View File

@ -37,8 +37,10 @@ public class RelationMsgConstructor {
.setToIdMSB(entityRelation.getTo().getId().getMostSignificantBits()) .setToIdMSB(entityRelation.getTo().getId().getMostSignificantBits())
.setToIdLSB(entityRelation.getTo().getId().getLeastSignificantBits()) .setToIdLSB(entityRelation.getTo().getId().getLeastSignificantBits())
.setToEntityType(entityRelation.getTo().getEntityType().name()) .setToEntityType(entityRelation.getTo().getEntityType().name())
.setType(entityRelation.getType()) .setType(entityRelation.getType());
.setAdditionalInfo(JacksonUtil.toString(entityRelation.getAdditionalInfo())); if (entityRelation.getAdditionalInfo() != null) {
builder.setAdditionalInfo(JacksonUtil.toString(entityRelation.getAdditionalInfo()));
}
if (entityRelation.getTypeGroup() != null) { if (entityRelation.getTypeGroup() != null) {
builder.setTypeGroup(getStringValue(entityRelation.getTypeGroup().name())); builder.setTypeGroup(getStringValue(entityRelation.getTypeGroup().name()));
} }