diff options
author | Krishnajinka <kris.jinka@samsung.com> | 2018-07-16 17:27:59 +0900 |
---|---|---|
committer | Krishnajinka <kris.jinka@samsung.com> | 2018-07-16 17:28:37 +0900 |
commit | 39191aaa6cf9f9d164c995e580c7df418b59b5c9 (patch) | |
tree | 6c6b05033b1bd63a8d95be2dc2ed30f6bb16f852 /ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system | |
parent | a96a3e49cd472aa902c22143358b87562603d47c (diff) |
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>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system')
-rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java index d54e0579..a03c9539 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java @@ -141,12 +141,10 @@ public class FileServletController { private void serveFile(HttpServletResponse response, File inFile) throws Exception { - OutputStream os = null; - InputStream is = null; - try { + + try(InputStream is = new BufferedInputStream(new FileInputStream(inFile)); + OutputStream os = new BufferedOutputStream(response.getOutputStream());) { response.reset(); - is = new BufferedInputStream(new FileInputStream(inFile)); - os = new BufferedOutputStream(response.getOutputStream()); response.setContentLength((int) inFile.length()); response.setContentType("application/octet-stream"); response.setHeader("Content-disposition", "attachment; filename=\"" @@ -154,16 +152,7 @@ public class FileServletController { copyStream(is, os); os.flush(); } catch (Exception ex) { - if (os == null) - throw new Exception("Could not open output stream for file "); - if (is == null) - throw new Exception("Could not open input stream for file "); - } finally { - if (os != null) { - os.close(); - } - if (is != null) - is.close(); + throw new Exception("Could not open input or output stream for file "); } } |