Reverting "Merge "fix try block""

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / components / CreateNewMicroServiceModel.java

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
index 0679e79..7757c2f 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
@@ -185,8 +185,9 @@ public class CreateNewMicroServiceModel {
            int BUFFER = 2048;
            File file = new File(zipFile);
 
-
-               try(ZipFile zip = new ZipFile("ExtractDir" + File.separator +file)) {
+           ZipFile zip = null;
+               try {
+                       zip = new ZipFile("ExtractDir" + File.separator +file);
                    String newPath =  zipFile.substring(0, zipFile.length() - 4);
                    new File(newPath).mkdir();
                    Enumeration zipFileEntries = zip.entries();
@@ -224,6 +225,14 @@ public class CreateNewMicroServiceModel {
                    }
            } catch (IOException e) {
                        logger.error("Failed to unzip model file " + zipFile + e);
+               }finally{
+                       if(zip != null){
+                               try {
+                                       zip.close();
+                               } catch (Exception e) {
+                                       logger.error("Exception Occured while closing the zip file"+e);
+                               }
+                       }
                }
        }