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

AbstractEfaProvider: Include bodyPeek in ParserException too.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-02 12:42:06 +01:00
parent 7117f9e933
commit 28e58caddd
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -432,7 +432,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
result.set(new SuggestLocationsResult(header, locations)); result.set(new SuggestLocationsResult(header, locations));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -521,7 +521,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
result.set(new NearbyLocationsResult(header, locations)); result.set(new NearbyLocationsResult(header, locations));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -592,7 +592,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
XmlPullUtil.skipExit(pp, "ci"); XmlPullUtil.skipExit(pp, "ci");
result.set(new NearbyLocationsResult(header, stations)); result.set(new NearbyLocationsResult(header, stations));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -843,7 +843,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
result.set(new NearbyLocationsResult(header, stations)); result.set(new NearbyLocationsResult(header, stations));
else else
result.set(new NearbyLocationsResult(header, stations.subList(0, maxLocations))); result.set(new NearbyLocationsResult(header, stations.subList(0, maxLocations)));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -1547,7 +1547,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
result.set(r); result.set(r);
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -1637,7 +1637,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} else { } else {
result.set(new QueryDeparturesResult(header, QueryDeparturesResult.Status.INVALID_STATION)); result.set(new QueryDeparturesResult(header, QueryDeparturesResult.Status.INVALID_STATION));
} }
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} }
} }
@ -2025,7 +2025,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTrips(url.build(), body.charStream())); result.set(queryTrips(url.build(), body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
throw new RuntimeException("uncategorized problem while processing " + url, x); throw new RuntimeException("uncategorized problem while processing " + url, x);
@ -2049,7 +2049,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTripsMobile(url.build(), from, via, to, body.charStream())); result.set(queryTripsMobile(url.build(), from, via, to, body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
throw new RuntimeException("uncategorized problem while processing " + url, x); throw new RuntimeException("uncategorized problem while processing " + url, x);
@ -2076,7 +2076,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTrips(url.build(), body.charStream())); result.set(queryTrips(url.build(), body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
throw new RuntimeException("uncategorized problem while processing " + url, x); throw new RuntimeException("uncategorized problem while processing " + url, x);
@ -2103,7 +2103,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTripsMobile(url.build(), null, null, null, body.charStream())); result.set(queryTripsMobile(url.build(), null, null, null, body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException | ParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
throw new RuntimeException("uncategorized problem while processing " + url, x); throw new RuntimeException("uncategorized problem while processing " + url, x);