avoid potential NPE

ait-energy · Jan 13, 2025 · cc9461a · cc9461a
1 parent 64949e6
commit cc9461a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/at/ac/ait/matsim/drs/optimizer/DrsRequest.java b/src/main/java/at/ac/ait/matsim/drs/optimizer/DrsRequest.java
@@ -45,6 +45,7 @@ public abstract class DrsRequest implements Request {
      * leg or a drs leg accompanied by walk access and egress legs.
      *
      * @param drsNetwork must only consist of links accessible to the drsDriver mode
+     * @return null in case no useful request can be created
      */
     public static DrsRequest create(Id<Request> id, RoutingModule driverRouter, Network drsNetwork, Person person,
             Trip trip) {

diff --git a/src/main/java/at/ac/ait/matsim/drs/optimizer/RequestsCollector.java b/src/main/java/at/ac/ait/matsim/drs/optimizer/RequestsCollector.java
@@ -63,6 +63,9 @@ public void collectRequests() {
 
                 Id<Request> id = Id.create(++requestId, Request.class);
                 DrsRequest request = DrsRequest.create(id, driverRouter, drsNetwork, person, trip);
+                if (request == null) {
+                    continue;
+                }
 
                 double distance = request.getNetworkRouteDistance();
                 if (request instanceof DrsDriverRequest) {