From d2807e0ff1ef288c7456383974a8607a8fca4821 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Tue, 10 May 2022 13:20:57 +0200
Subject: [PATCH] RED-4009: Fixed NPE if comments are null in
 RedactionLogMergeService

---
 .../v1/server/redaction/service/RedactionLogMergeService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
index f5a696f6..42a37430 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
@@ -349,7 +349,7 @@ public class RedactionLogMergeService {
     }
 
     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());
     }