fix potential NPE

matsim-org · Jun 13, 2024 · 9360e6c · 9360e6c
1 parent 23ec96b
commit 9360e6c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/matsim/src/main/java/ch/sbb/matsim/routing/pt/raptor/SwissRailRaptorCore.java b/matsim/src/main/java/ch/sbb/matsim/routing/pt/raptor/SwissRailRaptorCore.java
@@ -604,8 +604,10 @@ private void observeArrival(PathElement pe, RaptorObserver observer) {
 					backpointer = backpointer.comingFrom;
 				}
 				TransitStopFacility departureStopFacility = backpointer.toRouteStop.routeStop.getStopFacility();
-				TransitStopFacility arrivalStopFacility = pe.toRouteStop.routeStop.getStopFacility();
-				observer.arrivedAtStop(pe.firstDepartureTime, arrivalStopFacility, pe.arrivalTime, pe.transferCount, () -> createRaptorRoute(departureStopFacility, arrivalStopFacility, pe, pe.firstDepartureTime));
+				if (departureStopFacility != null) {
+					TransitStopFacility arrivalStopFacility = pe.toRouteStop.routeStop.getStopFacility();
+					observer.arrivedAtStop(pe.firstDepartureTime, arrivalStopFacility, pe.arrivalTime, pe.transferCount, () -> createRaptorRoute(departureStopFacility, arrivalStopFacility, pe, pe.firstDepartureTime));
+				}
 			}
 		}