From: Ram Koya <rk541m@att.com>
Date: Tue, 4 Sep 2018 15:41:50 +0000 (+0000)
Subject: Merge "Fixed Sonar Issues in LogRecord.java"
X-Git-Tag: 1.0.1~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ac12c63cc36197e569fba1c54e45b1b999384321;hp=c7ddeaab4dd317de91aac32e07404a2ed4ac6567;p=dmaap%2Fdatarouter.git

Merge "Fixed Sonar Issues in LogRecord.java"
---

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
index 1853ee30..70b8e6a0 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
@@ -59,23 +59,23 @@ public class LogRecord extends BaseLogRecord {
         Connection conn = null;
         try {
             conn = db.getConnection();
-            Statement stmt = conn.createStatement();
-            Iterator<Long[]> iter = bs.getRangeIterator();
-            PreparedStatement ps = conn.prepareStatement(sql);
-            while (iter.hasNext()) {
-                Long[] n = iter.next();
-                ps.setLong(1, n[0]);
-                ps.setLong(2, n[1]);
-                ResultSet rs = ps.executeQuery();
-                while (rs.next()) {
-                    LogRecord lr = new LogRecord(rs);
-                    os.write(lr.toString().getBytes());
+            try(Statement stmt = conn.createStatement()) {
+                Iterator<Long[]> iter = bs.getRangeIterator();
+                try(PreparedStatement ps = conn.prepareStatement(sql)) {
+                    while (iter.hasNext()) {
+                        Long[] n = iter.next();
+                        ps.setLong(1, n[0]);
+                        ps.setLong(2, n[1]);
+                        try(ResultSet rs = ps.executeQuery()) {
+                            while (rs.next()) {
+                                LogRecord lr = new LogRecord(rs);
+                                os.write(lr.toString().getBytes());
+                            }
+                            ps.clearParameters();
+                        }
+                    }
                 }
-                rs.close();
-                ps.clearParameters();
             }
-            ps.close();
-            stmt.close();
         } catch (SQLException e) {
             e.printStackTrace();
         } finally {