X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNodeClass.java;h=f3ef5d6a295275cc6bea87ffe4c3aa58b1f3ba4c;hb=refs%2Fchanges%2F55%2F87355%2F1;hp=1b368517b60c143ecab2c85e703c852b5f8c8de8;hpb=a1cc0279360b09663c1b59fd0b89a1c2e081dfbd;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..f3ef5d6a 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
@@ -32,7 +32,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.apache.log4j.Logger;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
 
 /**
@@ -44,7 +46,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 public abstract class NodeClass extends Syncable {
 
     private static Map<String, Integer> map;
-    private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+    private static EELFLogger intLogger = EELFManager.getInstance().getLogger("InternalLog");
     public NodeClass() {
         // init on first use
         if (map == null) {
@@ -105,20 +107,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 +130,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);
             }