From 71b5cdd6bca3604f5c1c980a64d11d34fe9ebeb9 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Tue, 25 Oct 2011 21:38:14 +0000 Subject: [PATCH] fixed NPE git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@841 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/dto/Connection.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/de/schildbach/pte/dto/Connection.java b/src/de/schildbach/pte/dto/Connection.java index 3979c294..535d116f 100644 --- a/src/de/schildbach/pte/dto/Connection.java +++ b/src/de/schildbach/pte/dto/Connection.java @@ -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