fixed NPE

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@841 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-10-25 21:38:14 +00:00
parent db3510f3d6
commit 71b5cdd6bc

View file

@ -78,7 +78,16 @@ public final class Connection implements Serializable
public String toString()
{
final SimpleDateFormat FORMAT = new SimpleDateFormat("E HH:mm");
return id + " " + FORMAT.format(getFirstTripDepartureTime()) + "-" + FORMAT.format(getFirstTripArrivalTime());
final StringBuilder str = new StringBuilder(id);
str.append(' ');
final Date firstTripDepartureTime = getFirstTripDepartureTime();
str.append(firstTripDepartureTime != null ? FORMAT.format(firstTripDepartureTime) : "null");
str.append('-');
final Date firstTripArrivalTime = getFirstTripArrivalTime();
str.append(firstTripArrivalTime != null ? FORMAT.format(firstTripArrivalTime) : "null");
return str.toString();
}
@Override