From 082027f7b6bd82cd4c2a91290006f944910cfe06 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 7 Oct 2021 10:51:21 +0300 Subject: [PATCH 1/2] fixed NPE --- .../v1/server/service/AnalysisFlagsCalculationService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java index f8deeb68f..66186b731 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java @@ -72,12 +72,12 @@ public class AnalysisFlagsCalculationService { } var lastChange = entry.getChanges().isEmpty() ? null : entry.getChanges().get(entry.getChanges().size() - 1); - if (lastChange != null && lastChange.getDateTime() != null && - !entry.getPositions().isEmpty() && viewedPages.get(entry.getPositions().get(0).getPage()).isBefore(lastChange.getDateTime())) { + + var viewedPage = entry.getPositions().isEmpty() ? null : viewedPages.get(entry.getPositions().get(0).getPage()); + if (lastChange != null && lastChange.getDateTime() != null && viewedPage != null && viewedPage.isBefore(lastChange.getDateTime())) { hasUpdates = true; } - if (hasRedactions && hasHints && hasSuggestions && hasImages && hasComments && hasUpdates) { break; } From cc6077f22c359eb8b2be15d8ae2a12e5d06e889e Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 7 Oct 2021 11:07:49 +0300 Subject: [PATCH 2/2] adde dlogs --- .../v1/server/service/scheduler/AutomaticAnalysisScheduler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java index 3f6850683..9ba5347dd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java @@ -43,6 +43,7 @@ public class AutomaticAnalysisScheduler { // queue up 5 files var allStatuses = getAllStatuses().iterator(); int queuedCount = 0; + log.info("Files that require reanalysis: {}", allStatuses); while (queuedCount < 5 && allStatuses.hasNext()) { var next = allStatuses.next();