mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-13 16:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

EFA: Check for empty document.

Browse source
This commit is contained in:
Andreas Schildbach 2015-01-22 13:33:31 +01:00
parent 70c1037bc4
commit 0b42b39fd7
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -3288,13 +3288,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private ResultHeader enterItdRequest(final XmlPullParser pp) throws XmlPullParserException, IOException private ResultHeader enterItdRequest(final XmlPullParser pp) throws XmlPullParserException, IOException
{ {
if (pp.getEventType() != XmlPullParser.START_DOCUMENT) if (pp.getEventType() != XmlPullParser.START_DOCUMENT)
throw new IllegalStateException("start of document expected"); throw new ParserException("start of document expected");
pp.next(); pp.next();
if (pp.getEventType() == XmlPullParser.DOCDECL) if (pp.getEventType() == XmlPullParser.DOCDECL)
pp.next(); pp.next();
if (pp.getEventType() == XmlPullParser.END_DOCUMENT)
throw new ParserException("empty document");
XmlPullUtil.require(pp, "itdRequest"); XmlPullUtil.require(pp, "itdRequest");
final String serverVersion = XmlPullUtil.attr(pp, "version"); final String serverVersion = XmlPullUtil.attr(pp, "version");
@ -3330,10 +3333,13 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private ResultHeader enterEfa(final XmlPullParser pp) throws XmlPullParserException, IOException private ResultHeader enterEfa(final XmlPullParser pp) throws XmlPullParserException, IOException
{ {
if (pp.getEventType() != XmlPullParser.START_DOCUMENT) if (pp.getEventType() != XmlPullParser.START_DOCUMENT)
throw new IllegalStateException("start of document expected"); throw new ParserException("start of document expected");
pp.next(); pp.next();
if (pp.getEventType() == XmlPullParser.END_DOCUMENT)
throw new ParserException("empty document");
XmlPullUtil.enter(pp, "efa"); XmlPullUtil.enter(pp, "efa");
final String now = XmlPullUtil.valueTag(pp, "now"); final String now = XmlPullUtil.valueTag(pp, "now");