From a3e95ddab2fd1f83adcdf7813c65acb876ced8e9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 12 Sep 2017 13:59:20 +0200 Subject: [PATCH] AbstractEfaProvider: Make processCoordinateStrings() to return null if there is no coordinate string. --- .../de/schildbach/pte/AbstractEfaProvider.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index a825ccbb..fc0fa7c4 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -2879,15 +2879,18 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return path; } - private List processCoordinateStrings(final XmlPullParser pp, final String tag) + private @Nullable List processCoordinateStrings(final XmlPullParser pp, final String tag) throws XmlPullParserException, IOException { final List path = new LinkedList<>(); - final String value = XmlPullUtil.valueTag(pp, tag); - for (final String coordStr : value.split(" +")) - path.add(parseCoord(coordStr)); - - return path; + final String value = XmlPullUtil.optValueTag(pp, tag, null); + if (value != null) { + for (final String coordStr : value.split(" +")) + path.add(parseCoord(coordStr)); + return path; + } else { + return null; + } } private List processCoordinateBaseElems(final XmlPullParser pp) throws XmlPullParserException, IOException {