diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java index 661fe4d1..696ee666 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java @@ -220,7 +220,10 @@ public class ReanalyzeService { // only approved id removals, that haven't been forced back afterwards var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream() .filter(idr -> idr.getStatus() == Status.APPROVED) - .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate()))) + .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> + forceRedact.getRequestDate() != null && + idr.getRequestDate() != null && + forceRedact.getRequestDate().isAfter(idr.getRequestDate()))) .map(IdRemoval::getId).collect(Collectors.toSet()); log.info("Removed Ids: {}", idsToRemove);