1 files changed, 3 insertions, 17 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
index d87a5b13..e976f144 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
@@ -1995,11 +1995,8 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
         String insertQry = Globals.getDownloadAllInsert();
         
         
-        Connection connection = null;
-        PreparedStatement pst = null;
-        try {
-        connection = DbUtils.getConnection();
-        pst = connection.prepareStatement(insertQry);
+        try(Connection connection = DbUtils.getConnection();
+            PreparedStatement pst = connection.prepareStatement(insertQry)){ 
         if(nvl(emailId).length()>0){
 	        pst.setInt(1, Integer.parseInt(userId));
 	        pst.setInt(2, Integer.parseInt(rr.getReportID()));
@@ -2019,8 +2016,6 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
     	        connection.commit();
 			}
         }
-        pst.close();
-        connection.close();
         logger.debug(EELFLoggerDelegate.debugLogger, ("Data inserted"));
         } catch (SQLException ex) { 
 	    	throw new RaptorException(ex);
@@ -2028,16 +2023,7 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
 	    	throw new RaptorException(ex);
 	    } catch (Exception ex) {
 	    	throw new RaptorException (ex);
-	    } finally {
-        	try {
-        		if(connection!=null)
-        			connection.close();
-        		if(pst!=null)
-        			pst.close();
-        	} catch (SQLException ex) {
-        		throw new RaptorException(ex);
-        	}
-        }
+	    }
         //DbUtils.commitTransaction(connection);
         //DbUtils.clearConnection(connection);