diff options
| author | Anton Tananaev <anton@traccar.org> | 2023-06-05 19:51:41 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2023-06-05 19:51:41 -0700 |
| commit | 1df3562c439ac8d23c1f03e60acba39468de138c (patch) | |
| tree | 36e2c5903ccb0db7d73f24e9529828ab8a5f3bc0 /src/main | |
| parent | fdbd269b9b99de074e2fd9d99d1702620102801b (diff) | |
| download | trackermap-server-1df3562c439ac8d23c1f03e60acba39468de138c.tar.gz trackermap-server-1df3562c439ac8d23c1f03e60acba39468de138c.tar.bz2 trackermap-server-1df3562c439ac8d23c1f03e60acba39468de138c.zip | |
Handle missing positions (fix #5104)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/traccar/reports/common/ReportUtils.java | 5 |
1 files changed, 4 insertions, 1 deletions
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; } } |