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

interpret HTTP_NOT_FOUND as expired session when querying for more connections

Browse source
This commit is contained in:
Andreas Schildbach 2013-06-11 21:46:33 +02:00
parent 4ac0b9a230
commit 287c84454f
3 changed files with 60 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,7 @@ import de.schildbach.pte.dto.ResultHeader;
import de.schildbach.pte.dto.StationDepartures;
import de.schildbach.pte.dto.Stop;
import de.schildbach.pte.exception.InvalidDataException;
import de.schildbach.pte.exception.NotFoundException;
import de.schildbach.pte.exception.ParserException;
import de.schildbach.pte.exception.ProtocolException;
import de.schildbach.pte.exception.SessionExpiredException;
@ -1686,6 +1687,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
{
throw new ParserException(x);
}
catch (final NotFoundException x)
{
throw new SessionExpiredException();
}
catch (final ProtocolException x) // must be html content
{
is.reset();

46
enabler/src/de/schildbach/pte/exception/NotFoundException.java Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright 2013 the original author or authors.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.schildbach.pte.exception;
import java.io.IOException;
import java.net.URL;
/**
* @author Andreas Schildbach
*/
public class NotFoundException extends IOException
{
private final URL url;
public NotFoundException()
{
this.url = null;
}
public NotFoundException(final URL url)
{
super(url.toString());
this.url = url;
}
public URL getUrl()
{
return url;
}
}

9
enabler/src/de/schildbach/pte/util/ParserUtils.java
View file

@ -40,6 +40,7 @@ import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
import de.schildbach.pte.exception.BlockedException;
import de.schildbach.pte.exception.NotFoundException;
import de.schildbach.pte.exception.UnexpectedRedirectException;
/**
@ -197,6 +198,10 @@ public final class ParserUtils
{
throw new BlockedException(url);
}
else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND)
{
throw new NotFoundException(url);
}
else
{
final String message = "got response: " + responseCode + " " + connection.getResponseMessage();
@ -348,6 +353,10 @@ public final class ParserUtils
{
throw new BlockedException(url);
}
else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND)
{
throw new NotFoundException(url);
}
else
{
final String message = "got response: " + responseCode + " " + connection.getResponseMessage();