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 8614a6e..101c9e6 100644 (file)
--- 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;\r
         try {\r
             conn = db.getConnection();\r
-            Statement  stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            while (rs.next()) {\r
-                rh.handleRow(rs);\r
-            }\r
-            rs.close();\r
-            stmt.close();\r
+           try( Statement  stmt = conn.createStatement()){\r
+             try(ResultSet rs = stmt.executeQuery(sql)){\r
+                 while (rs.next()) {\r
+                     rh.handleRow(rs);\r
+                 }\r
+             }\r
+           }\r
         } catch (SQLException sqlException) {\r
             intlogger.info("Failed to get Records. Exception = " +sqlException.getMessage(),sqlException);\r
         } finally {\r