update DR logging to log under one system

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / 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..f3ef5d6 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
@@ -32,7 +32,9 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.Set;\r
 import java.util.TreeSet;\r
-import org.apache.log4j.Logger;\r
+\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
 \r
 /**\r
@@ -44,7 +46,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 public abstract class NodeClass extends Syncable {\r
 \r
     private static Map<String, Integer> map;\r
-    private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+    private static EELFLogger intLogger = EELFManager.getInstance().getLogger("InternalLog");\r
     public NodeClass() {\r
         // init on first use\r
         if (map == null) {\r
@@ -105,20 +107,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 +130,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