|
|
@ -827,50 +827,14 @@ public class HTTPClient {
|
|
|
|
public void finish() throws IOException {
|
|
|
|
public void finish() throws IOException {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if (this.httpResponse != null) {
|
|
|
|
if (this.httpResponse != null) {
|
|
|
|
final HttpEntity httpEntity = this.httpResponse.getEntity();
|
|
|
|
// Ensures that the entity content Stream is closed.
|
|
|
|
if (httpEntity != null && httpEntity.isStreaming()) {
|
|
|
|
EntityUtils.consumeQuietly(this.httpResponse.getEntity());
|
|
|
|
/*
|
|
|
|
this.httpResponse.close();
|
|
|
|
* Try to fully consume the eventual remaining of the
|
|
|
|
|
|
|
|
* content stream : if too long abort the request. Not using
|
|
|
|
|
|
|
|
* EntityUtils.consumeQuietly(httpEntity) because too long
|
|
|
|
|
|
|
|
* to perform on large resources when calling this before
|
|
|
|
|
|
|
|
* full stream processing end : for example on caller
|
|
|
|
|
|
|
|
* exception handling .
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
InputStream contentStream = null;
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
contentStream = httpEntity.getContent();
|
|
|
|
|
|
|
|
if (contentStream != null) {
|
|
|
|
|
|
|
|
byte[] buffer = new byte[2048];
|
|
|
|
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
int readNb = contentStream.read(buffer);
|
|
|
|
|
|
|
|
while (readNb >= 0 && count < 10) {
|
|
|
|
|
|
|
|
readNb = contentStream.read(buffer);
|
|
|
|
|
|
|
|
count++;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (readNb >= 0) {
|
|
|
|
|
|
|
|
if (this.currentRequest != null) {
|
|
|
|
|
|
|
|
this.currentRequest.abort();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch(IOException e){
|
|
|
|
|
|
|
|
/* Silently ignore here IOException (for example caused by stream already closed) as in EntityUtils.consumeQuietly() */
|
|
|
|
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
if (contentStream != null) {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
contentStream.close();
|
|
|
|
|
|
|
|
} catch(IOException ignored) {}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
this.httpResponse.close();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
if (this.currentRequest != null) {
|
|
|
|
if (this.currentRequest != null) {
|
|
|
|
ConnectionInfo.removeConnection(this.currentRequest.hashCode());
|
|
|
|
ConnectionInfo.removeConnection(this.currentRequest.hashCode());
|
|
|
|
|
|
|
|
this.currentRequest.abort();
|
|
|
|
this.currentRequest = null;
|
|
|
|
this.currentRequest = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|