From bfa102fa11036c3a1c3c0adc336cbf01136e0046 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Thu, 3 Mar 2011 07:53:40 +0000 Subject: [PATCH] fixed NPE git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@518 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- .../schildbach/pte/AbstractHafasProvider.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index 0628559d..a7896eb0 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -808,12 +808,22 @@ public abstract class AbstractHafasProvider implements NetworkProvider protected String normalizeLine(final String type, final String line) { - final Matcher m = P_NORMALIZE_LINE.matcher(line); - final String strippedLine = m.matches() ? m.group(1) + m.group(2) : line; - final char normalizedType = normalizeType(type); + if (normalizedType != 0) - return normalizedType + strippedLine; + { + if (line != null) + { + final Matcher m = P_NORMALIZE_LINE.matcher(line); + final String strippedLine = m.matches() ? m.group(1) + m.group(2) : line; + + return normalizedType + strippedLine; + } + else + { + return Character.toString(normalizedType); + } + } throw new IllegalStateException("cannot normalize type '" + type + "' line '" + line + "'"); }