FIX TO USE TRY WITH RESOURCES

FIX SONAR ISSUES RELATED WITH USE OF TRY
WITH RESOURCES INSTEAD OF JUST TRY

Issue-ID: PORTAL-336
Change-Id: I143c3d6167b101e5113faa3c70f57bfb8638e8de
Signed-off-by: Krishnajinka <kris.jinka@samsung.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java
index 7722d9ed..1f6b4917 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java
@@ -171,9 +171,12 @@ SchedulerUtil schedulerUtil;
 							params, types
 							);
 	        
-			FileInputStream fileStream = new FileInputStream(readFile);
-			schedulerUtil.updateBinaryStream("update cr_report_file_history set file_blob = ? where hist_id = ?", v_hist_rec.hist_id, fileStream, v_hist_rec.file_size);
-			fileStream.close();
+			try(FileInputStream fileStream = new FileInputStream(readFile)) {
+				schedulerUtil.updateBinaryStream("update cr_report_file_history set file_blob = ? where hist_id = ?", v_hist_rec.hist_id, fileStream, v_hist_rec.file_size);
+			}catch (Exception e){
+				//throw the exception to outer block for handling it
+				throw e;
+			}
 			
 	        String userAddRecSql = 
 	       	Globals.getSchedulerUserEmails().replace("[p_schedule_id]", p_schedule_id+"");
@@ -401,18 +404,16 @@ SchedulerUtil schedulerUtil;
 		InputStream in  = con.getInputStream();
 		
 		try {
-			
-			FileOutputStream out = new FileOutputStream(outputFolder + java.io.File.separator + fileName );
-			try {
+
+			try (FileOutputStream out = new FileOutputStream(outputFolder + java.io.File.separator + fileName )) {
 				int inputLine;
 				
 				while ((inputLine = in.read()) != -1) {
 					out.write(inputLine);
 				}
 				out.flush();
-			}
-			finally {
-				out.close();
+			} catch(Exception e){
+				throw e;
 			}
 			
 		}