From 24e921e5474d15468f08fc2b547b714e270e8e37 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 4 Feb 2015 17:34:40 +0100
Subject: [PATCH] Method for public duration of a trip can return null.

---
 enabler/src/de/schildbach/pte/dto/Trip.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/dto/Trip.java b/enabler/src/de/schildbach/pte/dto/Trip.java
index 92311f53..32e6f2ec 100644
--- a/enabler/src/de/schildbach/pte/dto/Trip.java
+++ b/enabler/src/de/schildbach/pte/dto/Trip.java
@@ -113,7 +113,11 @@ public final class Trip implements Serializable
 			return null;
 	}
 
-	/** Duration of whole trip in milliseconds, including leading and trailing individual legs. */
+	/**
+	 * Duration of whole trip in milliseconds, including leading and trailing individual legs.
+	 * 
+	 * @return duration in ms
+	 */
 	public long getDuration()
 	{
 		final Date first = getFirstDepartureTime();
@@ -124,12 +128,17 @@ public final class Trip implements Serializable
 	/**
 	 * Duration of the public leg part in milliseconds. This includes individual legs between public legs, but excludes
 	 * individual legs that lead or trail the trip.
+	 * 
+	 * @return duration in ms, or null if there are no public legs
 	 */
-	public long getPublicDuration()
+	public Long getPublicDuration()
 	{
 		final Date first = getFirstPublicLegDepartureTime();
 		final Date last = getLastPublicLegArrivalTime();
-		return last.getTime() - first.getTime();
+		if (first != null && last != null)
+			return last.getTime() - first.getTime();
+		else
+			return null;
 	}
 
 	/** Minimum time occuring in this trip. */