Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from andrewgaul/close-streams 

Close streams on error paths
This commit is contained in:
Adrian Cole 2012-03-22 13:07:44 -07:00
parent 2ae849dd94 1040a5c779
commit 2a4bcf83b0
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java
View File

@ -156,6 +156,7 @@ public abstract class BaseHttpCommandExecutorService<Q> implements HttpCommandEx
utils.logResponse(headerLog, response, "<<"); utils.logResponse(headerLog, response, "<<");
if (response.getPayload() != null && wire.enabled()) if (response.getPayload() != null && wire.enabled())
wire.input(response); wire.input(response);
nativeRequest = null; // response took ownership of streams
int statusCode = response.getStatusCode(); int statusCode = response.getStatusCode();
if (statusCode >= 300) { if (statusCode >= 300) {
if (shouldContinue(response)) if (shouldContinue(response))

5
core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
View File

@ -255,12 +255,9 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
} }
/**
* Only disconnect if there is no content, as disconnecting will throw away unconsumed content.
*/
@Override @Override
protected void cleanup(HttpURLConnection connection) { protected void cleanup(HttpURLConnection connection) {
if (connection != null && connection.getContentLength() == 0) if (connection != null)
connection.disconnect(); connection.disconnect();
} }

2
core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java
View File

@ -201,7 +201,7 @@ public abstract class BaseRestClientExpectTest<S> {
@Override @Override
public void cleanup(HttpRequest nativeResponse) { public void cleanup(HttpRequest nativeResponse) {
if (nativeResponse.getPayload() != null) if (nativeResponse != null && nativeResponse.getPayload() != null)
nativeResponse.getPayload().release(); nativeResponse.getPayload().release();
} }