diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java index c1b1c8f8e6add..b3ea15d645941 100644 --- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java +++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java @@ -178,7 +178,6 @@ public void close() throws SQLException { } try { - AutoCloseables.close(clientHandler); allocator.getChildAllocators().forEach(AutoCloseables::closeNoChecked); AutoCloseables.close(allocator); diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java index 845f5372d3f74..ae876d7996a0e 100644 --- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java +++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java @@ -220,9 +220,7 @@ public FlightInfo getInfo(final String query) { @Override public void close() throws SQLException { - if (catalog.isPresent()) { - sqlClient.closeSession(new CloseSessionRequest(), getOptions()); - } + sqlClient.closeSession(new CloseSessionRequest(), getOptions()); try { AutoCloseables.close(sqlClient); } catch (final Exception e) {