Skip to content

Commit ec6ac27

Browse files
author
Georgi Neykov
committed
Merge branch 'Connection_Recycling_Improvements' into master
2 parents 1789aa6 + be64d79 commit ec6ac27

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

composer/src/main/java/com/pcloud/networking/api/DataApiResponseAdapter.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.pcloud.networking.api;
1818

1919
import com.pcloud.networking.client.Response;
20-
import com.pcloud.networking.client.ResponseData;
2120
import com.pcloud.networking.serialization.TypeAdapter;
2221

2322
import java.io.IOException;
@@ -26,7 +25,7 @@
2625

2726
class DataApiResponseAdapter<T> implements ResponseAdapter<T> {
2827

29-
private TypeAdapter<? extends DataApiResponse> typeAdapter;
28+
private final TypeAdapter<? extends DataApiResponse> typeAdapter;
3029

3130
DataApiResponseAdapter(TypeAdapter<? extends DataApiResponse> typeAdapter) {
3231
this.typeAdapter = typeAdapter;
@@ -38,8 +37,12 @@ public T adapt(Response response) throws IOException {
3837
boolean success = false;
3938
try {
4039
DataApiResponse result = typeAdapter.deserialize(response.responseBody().reader());
41-
ResponseData data = result.isSuccessful() ? response.responseBody().data() : null;
42-
result.setResponseData(data);
40+
if (result.isSuccessful()) {
41+
result.setResponseData(response.responseBody().data());
42+
} else {
43+
result.setResponseData(null);
44+
closeQuietly(response);
45+
}
4346
success = true;
4447
return (T) result;
4548
} finally {

0 commit comments

Comments
 (0)