Skip to content

Commit 6ae763b

Browse files
authored
Merge pull request #5 from hangum/master
Improved the physical connection to be closed.
2 parents 0935dfa + 7c09f9e commit 6ae763b

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

driver/src/main/java/com/dbschema/CassandraConnection.java

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
11
package com.dbschema;
22

33

4-
import com.datastax.driver.core.Session;
5-
6-
import java.sql.*;
4+
import java.sql.Array;
5+
import java.sql.Blob;
6+
import java.sql.CallableStatement;
7+
import java.sql.Clob;
8+
import java.sql.Connection;
9+
import java.sql.DatabaseMetaData;
10+
import java.sql.NClob;
11+
import java.sql.PreparedStatement;
12+
import java.sql.SQLException;
13+
import java.sql.SQLFeatureNotSupportedException;
14+
import java.sql.SQLWarning;
15+
import java.sql.SQLXML;
16+
import java.sql.Savepoint;
17+
import java.sql.Statement;
18+
import java.sql.Struct;
719
import java.util.Map;
820
import java.util.Properties;
921
import java.util.concurrent.Executor;
1022

23+
import com.datastax.driver.core.Cluster;
24+
import com.datastax.driver.core.Session;
25+
1126
public class CassandraConnection implements Connection {
1227
/**
1328
* This query retrieves Cassandra 2.x columns in DataGrip.
@@ -124,6 +139,13 @@ public void rollback() throws SQLException {
124139

125140
@Override
126141
public void close() {
142+
// Improved the physical connection to be closed.( https://github.com/DataGrip/cassandra-jdbc-driver/issues/4 )
143+
if(!isClosed) {
144+
final Cluster _cluster = session.getCluster();
145+
session.close();
146+
_cluster.close();
147+
}
148+
127149
isClosed = true;
128150
}
129151

0 commit comments

Comments
 (0)