Merge "Fixed Sonar issues in NodeClass.java"

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
index 1b36851..9d43bd0 100755 (executable)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
@@ -105,20 +105,20 @@ public abstract class NodeClass extends Syncable {
     public static void reload() {\r
         Map<String, Integer> m = new HashMap<String, Integer>();\r
         PreparedStatement ps = null;\r
-        ResultSet rs=null;\r
+\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
             String sql = "select NODEID, NAME from NODES";\r
             ps = conn.prepareStatement(sql);\r
-            rs = ps.executeQuery();\r
-            while (rs.next()) {\r
-                int id = rs.getInt("NODEID");\r
-                String name = rs.getString("NAME");\r
-                m.put(name, id);\r
+            try(ResultSet rs = ps.executeQuery()) {\r
+                while (rs.next()) {\r
+                    int id = rs.getInt("NODEID");\r
+                    String name = rs.getString("NAME");\r
+                    m.put(name, id);\r
+                }\r
             }\r
-            rs.close();\r
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
@@ -128,10 +128,6 @@ public abstract class NodeClass extends Syncable {
                 if(ps!=null){\r
                     ps.close();\r
                 }\r
-                if(rs!=null){\r
-                    rs.close();\r
-                }\r
-\r
             } catch (SQLException e) {\r
                 intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
             }\r