Modify the error message when basicInfo is null.

Change-Id: Ia40a670e678369a8f920a7d5b1b9298c1c7e7a6f
Issue-id:TOSCA-194
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 4cf64d3..cf879d9 100644 (file)
--- 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
@@ -124,6 +124,12 @@ public class PackageWrapper {
     if (isEnd) {
       PackageBasicInfo basicInfo = new PackageBasicInfo();
       basicInfo = PackageWrapperUtil.getPacageBasicInfo(fileLocation);
+      if (null == basicInfo.getType() || null == basicInfo.getProvider()
+          || null == basicInfo.getVersion()) {
+        LOG.error(
+            "Package basicInfo is incorrect ! basicIonfo = " + ToolUtil.objectToString(basicInfo));
+        return Response.serverError().build();
+      }
       String path =
           basicInfo.getType().toString() + File.separator + basicInfo.getProvider() + File.separator
               + fileName.replace(".csar", "") + File.separator + basicInfo.getVersion();

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
index 3a286cd..3e494e2 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
@@ -389,7 +389,7 @@ public class PackageWrapperUtil {
         }
       }
     } catch (IOException e1) {
-      LOG.error("judge package type error !");
+      LOG.error("judge package type error ! " + e1.getMessage());
     }
     if (isXmlCsar) {
       basicInfo.setFormat(CommonConstant.PACKAGE_XML_FORMAT);