From 1df3562c439ac8d23c1f03e60acba39468de138c Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 5 Jun 2023 19:51:41 -0700
Subject: Handle missing positions (fix #5104)

---
 src/main/java/org/traccar/reports/common/ReportUtils.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/traccar/reports')

diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java
index 28e3d2ae5..995e92676 100644
--- a/src/main/java/org/traccar/reports/common/ReportUtils.java
+++ b/src/main/java/org/traccar/reports/common/ReportUtils.java
@@ -392,7 +392,10 @@ public class ReportUtils {
                         new Columns.All(), new Condition.Equals("id", startEvent.getPositionId())));
                 Position endPosition = storage.getObject(Position.class, new Request(
                         new Columns.All(), new Condition.Equals("id", event.getPositionId())));
-                result.add(calculateTripOrStop(device, startPosition, endPosition, 0, ignoreOdometer, reportClass));
+                if (startPosition != null && endPosition != null) {
+                    result.add(calculateTripOrStop(
+                            device, startPosition, endPosition, 0, ignoreOdometer, reportClass));
+                }
                 startEvent = null;
             }
         }
-- 
cgit v1.2.3