mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-19 08:49:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix NPEs in required attribute methods

Browse source
This commit is contained in:
Andreas Schildbach 2013-06-20 00:52:22 +02:00
parent 9dd41526dd
commit 9f2624eb85
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
enabler/src/de/schildbach/pte/util/XmlPullUtil.java
View file

@ -111,7 +111,12 @@ public final class XmlPullUtil
public static String attr(final XmlPullParser pp, final String attrName) public static String attr(final XmlPullParser pp, final String attrName)
{ {
return pp.getAttributeValue(null, attrName).trim(); final String attr = optAttr(pp, attrName, null);
if (attr != null)
return attr;
else
throw new IllegalStateException("expecting attribute: " + attrName);
} }
public static String optAttr(final XmlPullParser pp, final String attrName, final String defaultValue) public static String optAttr(final XmlPullParser pp, final String attrName, final String defaultValue)
@ -131,7 +136,7 @@ public final class XmlPullUtil
public static int intAttr(final XmlPullParser pp, final String attrName) public static int intAttr(final XmlPullParser pp, final String attrName)
{ {
return Integer.parseInt(pp.getAttributeValue(null, attrName).trim()); return Integer.parseInt(attr(pp, attrName));
} }
public static int optIntAttr(final XmlPullParser pp, final String attrName, final int defaultValue) public static int optIntAttr(final XmlPullParser pp, final String attrName, final int defaultValue)
@ -145,7 +150,7 @@ public final class XmlPullUtil
public static float floatAttr(final XmlPullParser pp, final String attrName) public static float floatAttr(final XmlPullParser pp, final String attrName)
{ {
return Float.parseFloat(pp.getAttributeValue(null, attrName).trim()); return Float.parseFloat(attr(pp, attrName));
} }
public static float optFloatAttr(final XmlPullParser pp, final String attrName, final float defaultValue) public static float optFloatAttr(final XmlPullParser pp, final String attrName, final float defaultValue)