From a3ea6ec0c10d01fdb89dd96de04d9b593012756d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 30 Nov 2014 13:21:46 +0100 Subject: [PATCH] Fix NPE when trying to print result objects with error status. --- enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java | 3 ++- enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java | 3 ++- enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java b/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java index 89ddad7b..d2f1a022 100644 --- a/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java +++ b/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java @@ -53,7 +53,8 @@ public final class NearbyStationsResult implements Serializable { final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("[").append(this.status); - builder.append(" ").append(stations.size()).append(stations); + if (stations != null) + builder.append(" ").append(stations.size()).append(stations); builder.append("]"); return builder.toString(); } diff --git a/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java b/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java index ab57215e..66d2e78c 100644 --- a/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java +++ b/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java @@ -52,7 +52,8 @@ public final class QueryDeparturesResult implements Serializable { final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("[").append(this.status); - builder.append(" ").append(stationDepartures.size()).append(stationDepartures); + if (stationDepartures != null) + builder.append(" ").append(stationDepartures.size()).append(stationDepartures); builder.append("]"); return builder.toString(); } diff --git a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java index 16b8c286..8f2bb56f 100644 --- a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java +++ b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java @@ -57,7 +57,8 @@ public final class SuggestLocationsResult implements Serializable { final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("[").append(this.status); - builder.append(" ").append(suggestedLocations.size()).append(suggestedLocations); + if (suggestedLocations != null) + builder.append(" ").append(suggestedLocations.size()).append(suggestedLocations); builder.append("]"); return builder.toString(); }