[karaf-decanter] branch master updated: Make sure the resultset is closed properly in the JDBC collector

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git


The following commit(s) were added to refs/heads/master by this push:
     new 5ba6041  Make sure the resultset is closed properly in the JDBC collector
     new 8e0bc89  Merge pull request #107 from coheigea/resultset
5ba6041 is described below

commit 5ba6041c9da41e563885dd89f92b781d84912585
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 5 12:16:25 2019 +0000

    Make sure the resultset is closed properly in the JDBC collector
---
 .../java/org/apache/karaf/decanter/collector/jdbc/JdbcCollector.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/collector/jdbc/src/main/java/org/apache/karaf/decanter/collector/jdbc/JdbcCollector.java b/collector/jdbc/src/main/java/org/apache/karaf/decanter/collector/jdbc/JdbcCollector.java
index c86ab02..04dbd0c 100644
--- a/collector/jdbc/src/main/java/org/apache/karaf/decanter/collector/jdbc/JdbcCollector.java
+++ b/collector/jdbc/src/main/java/org/apache/karaf/decanter/collector/jdbc/JdbcCollector.java
@@ -109,8 +109,7 @@ public class JdbcCollector implements Runnable {
     public List<Map<String, Object>> query() {
         List<Map<String, Object>> dataRows = new ArrayList<>();
 
-        try {
-            ResultSet resultSet = preparedStatement.executeQuery();
+        try (ResultSet resultSet = preparedStatement.executeQuery()) {
             ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
             int columnCount = resultSetMetaData.getColumnCount();
             int rowId = 1;