1 files changed, 2 insertions, 11 deletions
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 7757c2f19..0679e79d8 100644
--- 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,9 +185,8 @@ public class CreateNewMicroServiceModel {
 	    int BUFFER = 2048;
 	    File file = new File(zipFile);
 
-	    ZipFile zip = null;
-		try {
-			zip = new ZipFile("ExtractDir" + File.separator +file);
+
+		try(ZipFile zip = new ZipFile("ExtractDir" + File.separator +file)) {
 		    String newPath =  zipFile.substring(0, zipFile.length() - 4);
 		    new File(newPath).mkdir();
 		    Enumeration zipFileEntries = zip.entries();
@@ -225,14 +224,6 @@ 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);
-				}
-			}
 		}
 	}