Browse Source

fixed NPE

pull/7762/head
dashevchenko 4 years ago
parent
commit
c81e442b35
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java

4
dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java

@ -89,7 +89,9 @@ public abstract class AbstractAlarmCommentEntity<T extends AlarmComment> extends
AlarmComment alarmComment = new AlarmComment(new AlarmCommentId(id)); AlarmComment alarmComment = new AlarmComment(new AlarmCommentId(id));
alarmComment.setCreatedTime(createdTime); alarmComment.setCreatedTime(createdTime);
alarmComment.setAlarmId(new AlarmId(alarmId)); alarmComment.setAlarmId(new AlarmId(alarmId));
alarmComment.setUserId(new UserId(userId)); if (userId != null) {
alarmComment.setUserId(new UserId(userId));
}
alarmComment.setType(type); alarmComment.setType(type);
alarmComment.setComment(comment); alarmComment.setComment(comment);
return alarmComment; return alarmComment;

Loading…
Cancel
Save