From: nancylizi <li.zi30@zte.com.cn>
Date: Sat, 22 Oct 2016 08:38:24 +0000 (+0800)
Subject: Delete package from temp directory and HTTP server while parse package failed.
X-Git-Tag: release/sun~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5a6a64146aa0c2e5a0c68c542260416f9d3268b6;p=vfc%2Fnfvo%2Fcatalog.git

Delete package from temp directory and HTTP server while parse package failed.

Change-Id: I19fad483b26e36ec8554a5319b1f4b0f616498ea
Issue-id:TOSCA-133
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
---

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java
index 9025523c..43e70919 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java
@@ -151,6 +151,11 @@ public class PackageWrapper {
           LOG.info("Package parse success ! serviceTemplateId = " + serviceTemplateId);
         } catch (Exception e1) {
           LOG.error("Parse package error ! ");
+          String packagePath = PackageWrapperUtil.getPackagePath(packageData.getCsarId());
+          FileManagerFactory.createFileManager().delete(packagePath);
+          if (tempDirName != null) {
+            ToolUtil.deleteDir(new File(tempDirName));
+          }
           PackageManager.getInstance().deletePackage(packateDbData.getCsarId());
           throw new Exception(e1);
         }