From fc9af962eca0a88b28b4c5252883446c4d57eb11 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 12 Jul 2020 14:51:24 -0700 Subject: 1.3.2 --- other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java | 3 +++ other/java/client/src/main/java/seaweedfs/client/SeaweedUtil.java | 5 ++++- other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'other/java/client/src') diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java index fe4db538b..7e66bcf8f 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java @@ -93,8 +93,11 @@ public class SeaweedRead { data = EntityUtils.toByteArray(entity); + EntityUtils.consume(entity); + } finally { response.close(); + request.releaseConnection(); } if (chunkView.isCompressed) { diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedUtil.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedUtil.java index 11bd20cf0..e2835b718 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedUtil.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedUtil.java @@ -1,7 +1,8 @@ package seaweedfs.client; -import org.apache.http.client.HttpClient; +import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; @@ -19,6 +20,8 @@ public class SeaweedUtil { public static CloseableHttpClient getClosableHttpClient() { return HttpClientBuilder.create() .setConnectionManager(cm) + .setConnectionReuseStrategy(DefaultConnectionReuseStrategy.INSTANCE) + .setKeepAliveStrategy(DefaultConnectionKeepAliveStrategy.INSTANCE) .build(); } } diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java index dd5144f97..e9819668c 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java @@ -7,6 +7,7 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.mime.HttpMultipartMode; import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.util.EntityUtils; import java.io.ByteArrayInputStream; import java.io.Closeable; @@ -111,9 +112,12 @@ public class SeaweedWrite { etag = etag.substring(1, etag.length() - 1); } + EntityUtils.consume(response.getEntity()); + return etag; } finally { response.close(); + post.releaseConnection(); } } -- cgit v1.2.3