Skip to content

Commit 9ce07fc

Browse files
committed
Ensure AvaticaResultSet is closed when ArrowFlightJdbcVectorSchemaRootResultSet is closed
1 parent c3e1131 commit 9ce07fc

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.sql.Types;
2323
import java.util.HashSet;
2424
import java.util.List;
25-
import java.util.Objects;
2625
import java.util.Set;
2726
import java.util.TimeZone;
2827
import org.apache.arrow.driver.jdbc.utils.ConvertUtils;
@@ -159,12 +158,10 @@ public void close() {
159158
} catch (final Exception e) {
160159
exceptions.add(e);
161160
}
162-
if (!Objects.isNull(statement)) {
163-
try {
164-
super.close();
165-
} catch (final Exception e) {
166-
exceptions.add(e);
167-
}
161+
try {
162+
super.close();
163+
} catch (final Exception e) {
164+
exceptions.add(e);
168165
}
169166
exceptions.parallelStream().forEach(e -> LOGGER.error(e.getMessage(), e));
170167
exceptions.stream()

0 commit comments

Comments
 (0)