#74 fix for connections leak when no Connection Pool used (#75)

* #74 fix for connections leak when no Connection Pool used * #74 fix for connections leak when no Connection Pool used, null check
Blynk-Technologies · Dec 4, 2019 · 9198f70 · 9198f70
1 parent 27907f8
commit 9198f70
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/src/main/java/cc/blynk/clickhouse/ClickHouseConnectionImpl.java b/src/main/java/cc/blynk/clickhouse/ClickHouseConnectionImpl.java
@@ -178,7 +178,7 @@ public void rollback() {
 
     @Override
     public void close() throws SQLException {
-        httpConnector.closeClient();
+        httpConnector.close();
         closed = true;
     }
 
@@ -388,7 +388,7 @@ public boolean isValid(int timeout) throws SQLException {
             return false;
         } finally {
             if (isAnotherHttpClient) {
-                connector.closeClient();
+                connector.close();
             }
         }
     }
@@ -458,10 +458,6 @@ public int getNetworkTimeout() {
         return 0;
     }
 
-    void cleanConnections() {
-        httpConnector.cleanConnections();
-    }
-
     String getUrl() {
         return url;
     }

diff --git a/src/main/java/cc/blynk/clickhouse/http/DefaultHttpConnector.java b/src/main/java/cc/blynk/clickhouse/http/DefaultHttpConnector.java
@@ -50,7 +50,9 @@ final class DefaultHttpConnector implements HttpConnector {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultHttpConnector.class);
 
-    protected final ClickHouseProperties properties;
+    private final ClickHouseProperties properties;
+
+    private HttpURLConnection httpURLConnection;
 
     DefaultHttpConnector(ClickHouseProperties properties) {
         this.properties = properties;
@@ -93,13 +95,10 @@ public InputStream post(List<ClickHouseExternalData> externalData, URI uri) thro
     }
 
     @Override
-    public void cleanConnections() {
-
-    }
-
-    @Override
-    public void closeClient() {
-
+    public void close() {
+        if (this.httpURLConnection != null) {
+            this.httpURLConnection.disconnect();
+        }
     }
 
     private void sendPostRequest(String sql, List<byte[]> batches, HttpURLConnection connection)
@@ -212,22 +211,28 @@ private byte[] buildMultipartData(List<ClickHouseExternalData> externalData, Str
 
     private HttpURLConnection buildConnection(URI uri) throws ClickHouseException {
         try {
+            HttpURLConnection prevConnection = this.httpURLConnection;
+            if (prevConnection != null) {
+                prevConnection.disconnect();
+            }
+
             URL url = uri.toURL();
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setInstanceFollowRedirects(true);
-            connection.setRequestMethod("POST");
-            connection.setDoInput(true);
-            connection.setDoOutput(true);
+            HttpURLConnection newConnection = (HttpURLConnection) url.openConnection();
+            newConnection.setInstanceFollowRedirects(true);
+            newConnection.setRequestMethod("POST");
+            newConnection.setDoInput(true);
+            newConnection.setDoOutput(true);
 
-            connection.setConnectTimeout(properties.getConnectionTimeout());
+            newConnection.setConnectTimeout(properties.getConnectionTimeout());
 
-            setDefaultHeaders(connection);
+            setDefaultHeaders(newConnection);
 
-            if (connection instanceof HttpsURLConnection) {
-                configureHttps((HttpsURLConnection) connection);
+            if (newConnection instanceof HttpsURLConnection) {
+                configureHttps((HttpsURLConnection) newConnection);
             }
 
-            return connection;
+            this.httpURLConnection = newConnection;
+            return newConnection;
         } catch (IOException e) {
             log.error("Can't build connection. {}", e.getMessage());
             throw ClickHouseExceptionSpecifier.specify(e, properties.getHost(), properties.getPort());

diff --git a/src/main/java/cc/blynk/clickhouse/http/HttpConnector.java b/src/main/java/cc/blynk/clickhouse/http/HttpConnector.java
@@ -5,7 +5,6 @@
 
 import java.io.InputStream;
 import java.net.URI;
-import java.sql.SQLException;
 import java.util.List;
 
 public interface HttpConnector {
@@ -20,7 +19,5 @@ public interface HttpConnector {
 
     void post(String sql, List<byte[]> data, URI uri) throws ClickHouseException;
 
-    void cleanConnections();
-
-    void closeClient() throws SQLException;
+    void close();
 }