Define constant instead of localhost

[vfc/nfvo/driver/vnfm/svnfm.git] / huawei / vnfmadapter / VnfmadapterService / service / src / main / java / org / onap / vfc / nfvo / vnfm / svnfm / vnfmadapter / common / DownloadCsarManager.java

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 66d3b65..24d6ed1 100644 (file)
--- 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
@@ -20,6 +20,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
@@ -163,15 +164,15 @@ public class DownloadCsarManager {
      * 
      * @param fileName filePath
      * @return
+     * @throws IOException
      */
     public static int unzipCSAR(String fileName, String filePath) {
         final int BUFFER = 2048;
         int status = 0;
-
+        ZipFile zipFile = null;
         try {
-            ZipFile zipFile = new ZipFile(fileName);
+            zipFile = new ZipFile(fileName);
             Enumeration emu = zipFile.entries();
-            int i = 0;
             while(emu.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry)emu.nextElement();
                 // read directory as file first,so only need to create directory
@@ -199,11 +200,21 @@ public class DownloadCsarManager {
                 bos.close();
                 bis.close();
             }
+
             status = Constant.UNZIP_SUCCESS;
-            zipFile.close();
+
         } catch(Exception e) {
             status = Constant.UNZIP_FAIL;
-            e.printStackTrace();
+            LOG.error("Exception: " + e);
+        } finally {
+            if(zipFile != null) {
+                try {
+                    zipFile.close();
+                } catch(IOException e) {
+                    LOG.error("IOException: " + e);
+                    ;
+                }
+            }
         }
         return status;
     }