From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 20 Feb 2018 05:38:11 +0000 (+0530)
Subject: Close the stream properly
X-Git-Tag: v1.1.0~117
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F32197%2F2;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

Close the stream properly

Issue-ID: VFC-764

Change-Id: I6ec52e49877e3a8bcc55fd2e91f05cfe52473d4e
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
index 2cbd1ab8..b09c50d7 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
@@ -192,17 +192,17 @@ public class DownloadCsarManager {
                 if(parent != null && (!parent.exists())) {
                     parent.mkdirs();
                 }
-                FileOutputStream fos = new FileOutputStream(file);
-                BufferedOutputStream bos = new BufferedOutputStream(fos, BUFFER);
+                try(FileOutputStream fos = new FileOutputStream(file)){
+                    try(BufferedOutputStream bos = new BufferedOutputStream(fos, BUFFER)){
 
-                int count;
-                byte data[] = new byte[BUFFER];
-                while((count = bis.read(data, 0, BUFFER)) != -1) {
-                    bos.write(data, 0, count);
+                    int count;
+                    byte data[] = new byte[BUFFER];
+                    while((count = bis.read(data, 0, BUFFER)) != -1) {
+                        bos.write(data, 0, count);
+                    }
+                    bos.flush();
+                    }
                 }
-                bos.flush();
-                bos.close();
-                bis.close();
             }
 
             status = Constant.UNZIP_SUCCESS;