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

fixed not checking for HTTP status in lots of cases

Browse source
This commit is contained in:
Andreas Schildbach 2012-05-18 11:56:09 +02:00
parent 611814cb88
commit 665ee2730d
1 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,36 +111,48 @@ public final class ParserUtils
writer.close();
}
final Reader pageReader = new InputStreamReader(connection.getInputStream(), encoding);
if (!url.equals(connection.getURL()))
throw new UnexpectedRedirectException(url, connection.getURL());
copy(pageReader, buffer);
pageReader.close();
if (buffer.length() > SCRAPE_PAGE_EMPTY_THRESHOLD)
final int responseCode = connection.getResponseCode();
if (responseCode == HttpURLConnection.HTTP_OK)
{
if (sessionCookieName != null)
final Reader pageReader = new InputStreamReader(connection.getInputStream(), encoding);
if (!url.equals(connection.getURL()))
throw new UnexpectedRedirectException(url, connection.getURL());
copy(pageReader, buffer);
pageReader.close();
if (buffer.length() > SCRAPE_PAGE_EMPTY_THRESHOLD)
{
for (final Map.Entry<String, List<String>> entry : connection.getHeaderFields().entrySet())
if (sessionCookieName != null)
{
if ("set-cookie".equalsIgnoreCase(entry.getKey()))
for (final Map.Entry<String, List<String>> entry : connection.getHeaderFields().entrySet())
{
for (final String value : entry.getValue())
if ("set-cookie".equalsIgnoreCase(entry.getKey()))
{
if (value.startsWith(sessionCookieName))
for (final String value : entry.getValue())
{
stateCookie = value.split(";", 2)[0];
if (value.startsWith(sessionCookieName))
{
stateCookie = value.split(";", 2)[0];
}
}
}
}
}
}
return buffer;
return buffer;
}
else
{
final String message = "got empty page (length: " + buffer.length() + ")";
if (tries-- > 0)
System.out.println(message + ", retrying...");
else
throw new IOException(message + ": " + url);
}
}
else
{
final String message = "got empty page (length: " + buffer.length() + ")";
final String message = "got response: " + responseCode + " " + connection.getResponseMessage();
if (tries-- > 0)
System.out.println(message + ", retrying...");
else