More bug fix and refactoring

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / Parameters.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
index 14a0a9d..79fc91b 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
@@ -108,8 +108,8 @@ public class Parameters extends Syncable {
     public static Collection<Parameters> getParameterCollection() {\r
         Collection<Parameters> coll = new ArrayList<>();\r
         try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
-            PreparedStatement ps = conn.prepareStatement("select * from PARAMETERS")) {\r
-            ResultSet rs = ps.executeQuery();\r
+            PreparedStatement ps = conn.prepareStatement("select * from PARAMETERS");\r
+            ResultSet rs = ps.executeQuery()) {\r
             while (rs.next()) {\r
                 Parameters param = new Parameters(rs);\r
                 coll.add(param);\r
@@ -132,9 +132,10 @@ public class Parameters extends Syncable {
             PreparedStatement stmt = conn.prepareStatement(\r
                 "select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?")) {\r
             stmt.setString(1, key);\r
-            ResultSet rs = stmt.executeQuery();\r
-            if (rs.next()) {\r
-                val = new Parameters(rs);\r
+            try (ResultSet rs = stmt.executeQuery()) {\r
+                if (rs.next()) {\r
+                    val = new Parameters(rs);\r
+                }\r
             }\r
         } catch (SQLException e) {\r
             intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r