From: Ram Koya <rk541m@att.com>
Date: Wed, 29 Aug 2018 13:54:57 +0000 (+0000)
Subject: Merge "Fixed Critical Sonar Issues in LogServlet.java"
X-Git-Tag: 1.0.1~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8a27631d961de4dfcace31a0107a701b735f6959;hp=73663e92fc9db1ce1930553d0d96672b020275ae;p=dmaap%2Fdatarouter.git

Merge "Fixed Critical Sonar Issues in LogServlet.java"
---

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index 8614a6e8..101c9e6f 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -417,13 +417,13 @@ public class LogServlet extends BaseServlet {
         Connection conn = null;
         try {
             conn = db.getConnection();
-            Statement  stmt = conn.createStatement();
-            ResultSet rs = stmt.executeQuery(sql);
-            while (rs.next()) {
-                rh.handleRow(rs);
-            }
-            rs.close();
-            stmt.close();
+           try( Statement  stmt = conn.createStatement()){
+             try(ResultSet rs = stmt.executeQuery(sql)){
+                 while (rs.next()) {
+                     rh.handleRow(rs);
+                 }
+             }
+           }
         } catch (SQLException sqlException) {
             intlogger.info("Failed to get Records. Exception = " +sqlException.getMessage(),sqlException);
         } finally {