From: Amaresh Kumar <kamaresh@in.ibm.com>
Date: Fri, 31 Aug 2018 12:34:15 +0000 (+0530)
Subject: Fixed Sonar Issues in NodeClass.java
X-Git-Tag: 1.0.1~30^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=f435e534f7d4653ee3cdac429acbfeec314d7ba4

Fixed Sonar Issues in NodeClass.java

https://sonar.onap.org/project/issues?fileUuids=AWHFaQiuEU5FCDfKtnFN&id=org.onap.dmaap.datarouter%3Aparent&open=AWHFaQp1EU5FCDfKtnb5&resolved=false&severities=BLOCKER

Issue-ID: DMAAP-683
Change-Id: I49551fc807d455d656eb84661b2507b85f681d4e
Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>
---

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);