Merge pull request #5857 from Skanetrafiken/timetable-feedid-comparison

Fix comparison of feedId
opentripplanner · May 23, 2024 · 8d2f1c1 · 8d2f1c1
2 parents e2868c6 + cef1fd5
commit 8d2f1c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java
@@ -126,7 +126,7 @@ public TripTimes getTripTimes(Trip trip) {
 
   public TripTimes getTripTimes(FeedScopedId tripId) {
     for (TripTimes tt : tripTimes) {
-      if (tt.getTrip().getId() == tripId) {
+      if (tt.getTrip().getId().equals(tripId)) {
         return tt;
       }
     }

diff --git a/src/test/java/org/opentripplanner/model/TimetableTest.java b/src/test/java/org/opentripplanner/model/TimetableTest.java
@@ -66,6 +66,12 @@ public static void setUp() throws Exception {
     trip_1_1_index = timetable.getTripIndex(new FeedScopedId(feedId, TRIP_ID));
   }
 
+  @Test
+  public void getGetTripTimes() {
+    var tt = timetable.getTripTimes(new FeedScopedId(feedId, TRIP_ID));
+    assertNotNull(tt);
+  }
+
   @Test
   public void tripNotFoundInPattern() {
     // non-existing trip