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

AbstractHafasMobileProvider: Fix NPE when parsing 'errTxt' element.

Browse source
This commit is contained in:
Andreas Schildbach 2018-06-24 12:35:30 +02:00
parent 7ef9fe67ac
commit 8beedbdc25
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java
View file

@ -433,7 +433,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
checkState("TripSearch".equals(svcRes.getString("meth")));
final String err = svcRes.getString("err");
if (!"OK".equals(err)) {
final String errTxt = svcRes.getString("errTxt");
final String errTxt = svcRes.optString("errTxt");
log.debug("Hafas error: {} {}", err, errTxt);
if ("H890".equals(err)) // No connections found.
return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS);
@ -454,7 +454,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
return new QueryTripsResult(header, QueryTripsResult.Status.SERVICE_DOWN);
if ("LOCATION".equals(err) && "HCI Service: location missing or invalid".equals(errTxt))
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_LOCATION);
throw new RuntimeException(err + " " + errTxt);
throw new RuntimeException(err + (errTxt != null ? " " + errTxt : ""));
}
final JSONObject res = svcRes.getJSONObject("res");