RED-4009: Fixed NPE if comments are null in RedactionLogMergeService
This commit is contained in:
parent
e49bbfca88
commit
d2807e0ff1
@ -349,7 +349,7 @@ public class RedactionLogMergeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<RedactionLogComment> convert(List<Comment> comments) {
|
private List<RedactionLogComment> convert(List<Comment> comments) {
|
||||||
return comments.stream().map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(),
|
return comments == null ? null :comments.stream().map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(),
|
||||||
c.getFileId(), c.getDate(), c.getSoftDeletedTime())).collect(Collectors.toList());
|
c.getFileId(), c.getDate(), c.getSoftDeletedTime())).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user