Merge "Fixed Sonar Issues in NodeClass.java"

1 files changed, 5 insertions, 1 deletions

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 f3eb1eb6..1b368517 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,13 +105,14 @@ 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);

-            ResultSet rs = ps.executeQuery();

+            rs = ps.executeQuery();

             while (rs.next()) {

                 int id = rs.getInt("NODEID");

                 String name = rs.getString("NAME");

@@ -127,6 +128,9 @@ 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);