merge ...

laidig · Jan 19, 2017 · 284754c · 284754c
1 parent 293769d
commit 284754c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/gtfs-validation-lib/src/main/java/com/conveyal/gtfs/service/impl/GtfsStatisticsService.java b/gtfs-validation-lib/src/main/java/com/conveyal/gtfs/service/impl/GtfsStatisticsService.java
@@ -7,6 +7,7 @@
 import java.util.Calendar;
 =======
 import java.time.Duration;
+import java.util.ArrayList;
 import java.time.ZoneId;
 >>>>>>> bec383dbc97456658f7cacb0a7a14fc608ec5e6a
 import java.util.Collection;
@@ -25,7 +26,7 @@
 import org.onebusaway.gtfs.model.Stop;
 import org.onebusaway.gtfs.model.StopTime;
 import org.onebusaway.gtfs.model.Trip;
-<<<<<<< HEAD
+import org.onebusaway.gtfs.serialization.comparators.ServiceCalendarDateComparator;
 import org.onebusaway.gtfs.model.calendar.ServiceDate;
 import org.onebusaway.gtfs.serialization.comparators.ServiceCalendarDateComparator;
 =======
@@ -83,7 +84,8 @@ public Date getCalendarServiceRangeStart() {
 		if (startDate != null){
 			return startDate;
 		} else {
-			return getCalendarDateStart(); 
+			// an exception here means that there are no dates in the feed at all
+			return getCalendarDateStart().orElseThrow(IllegalStateException::new); 
 	}
 
 	}
@@ -100,7 +102,7 @@ public Date getCalendarServiceRangeEnd() {
 		if (endDate != null){
 		return endDate;
 		} else {
-			return getCalendarDateEnd();
+			return getCalendarDateEnd().orElseThrow(IllegalStateException::new);
 		}
 	}