X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNodeClass.java;h=9d43bd0aafdf77432cfb0538f91dc681b7e4119b;hb=28d544f0c3b997da5628d4dcdb8e6773a0440cb4;hp=1b368517b60c143ecab2c85e703c852b5f8c8de8;hpb=e78029abb4dd73bf14e0291096d5b6762c55739b;p=dmaap%2Fdatarouter.git

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 1b368517..9d43bd0a 100755
--- 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() {
         Map<String, Integer> m = new HashMap<String, Integer>();
         PreparedStatement ps = null;
-        ResultSet rs=null;
+
         try {
             DB db = new DB();
             @SuppressWarnings("resource")
             Connection conn = db.getConnection();
             String sql = "select NODEID, NAME from NODES";
             ps = conn.prepareStatement(sql);
-            rs = ps.executeQuery();
-            while (rs.next()) {
-                int id = rs.getInt("NODEID");
-                String name = rs.getString("NAME");
-                m.put(name, id);
+            try(ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    int id = rs.getInt("NODEID");
+                    String name = rs.getString("NAME");
+                    m.put(name, id);
+                }
             }
-            rs.close();
             ps.close();
             db.release(conn);
         } catch (SQLException e) {
@@ -128,10 +128,6 @@ public abstract class NodeClass extends Syncable {
                 if(ps!=null){
                     ps.close();
                 }
-                if(rs!=null){
-                    rs.close();
-                }
-
             } catch (SQLException e) {
                 intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);
             }