这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,10 @@ final String expandSafe(final String urlArg) throws IOException {
}

final Pair<Integer, String> expandSingleLevelSafe(final String url) throws IOException {
HttpGet request = null;
HttpEntity httpEntity = null;
InputStream entityContentStream = null;

final HttpGet request = new HttpGet(url);
try {
request = new HttpGet(url);
final HttpResponse httpResponse = client.execute(request);

httpEntity = httpResponse.getEntity();
entityContentStream = httpEntity.getContent();

final int statusCode = httpResponse.getStatusLine().getStatusCode();
if (statusCode != 301 && statusCode != 302) {
return new ImmutablePair<Integer, String>(statusCode, url);
Expand All @@ -105,55 +98,33 @@ final Pair<Integer, String> expandSingleLevelSafe(final String url) throws IOExc
Preconditions.checkState(headers.length == 1);
final String newUrl = headers[0].getValue();

EntityUtils.consume(httpResponse.getEntity());
return new ImmutablePair<Integer, String>(statusCode, newUrl);
} catch (final IllegalArgumentException uriEx) {
return new ImmutablePair<Integer, String>(500, url);
} finally {
if (request != null) {
request.releaseConnection();
}
if (entityContentStream != null) {
entityContentStream.close();
}
if (httpEntity != null) {
EntityUtils.consume(httpEntity);
}
request.releaseConnection();
}
}

final String expandSingleLevel(final String url) throws IOException {
HttpGet request = null;
HttpEntity httpEntity = null;
InputStream entityContentStream = null;

final HttpGet request = new HttpGet(url);
try {
request = new HttpGet(url);
final HttpResponse httpResponse = client.execute(request);

httpEntity = httpResponse.getEntity();
entityContentStream = httpEntity.getContent();

final HttpResponse httpResponse = client.execute(request);
final int statusCode = httpResponse.getStatusLine().getStatusCode();
if (statusCode != 301 && statusCode != 302) {
return url;
}
final Header[] headers = httpResponse.getHeaders(HttpHeaders.LOCATION);
Preconditions.checkState(headers.length == 1);
final String newUrl = headers[0].getValue();

EntityUtils.consume(httpResponse.getEntity());
return newUrl;
} catch (final IllegalArgumentException uriEx) {
return url;
} finally {
if (request != null) {
request.releaseConnection();
}
if (entityContentStream != null) {
entityContentStream.close();
}
if (httpEntity != null) {
EntityUtils.consume(httpEntity);
}
request.releaseConnection();
}
}

Expand Down