From: nancylizi <li.zi30@zte.com.cn>
Date: Wed, 12 Oct 2016 03:35:52 +0000 (+0800)
Subject: Fix bug "define csar meta in different way may cause upload package failed".
X-Git-Tag: release/sun~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c3f0d4c37d759e86f45d1f77a5a17ea71a711ea5;p=vfc%2Fnfvo%2Fcatalog.git

Fix bug "define csar meta in different way may cause upload package failed".
Issue-id:TOSCA-106

Change-Id: I5c4c73229787bdd17280c12d1074dffc21a1f327
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
---

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 87346a11..763e2009 100644
--- 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
@@ -403,17 +403,19 @@ public class PackageWrapperUtil {
       reader = new BufferedReader(new FileReader(file));
       String tempString = null;
       while ((tempString = reader.readLine()) != null) {
-        if (tempString.startsWith(CommonConstant.CSAR_TYPE_META)) {
+        int count1 = tempString.indexOf(":");
+        String meta = tempString.substring(0, count1).trim();
+        if (meta.equalsIgnoreCase(CommonConstant.CSAR_TYPE_META)) {
           int count = tempString.indexOf(":") + 1;
-          basicInfo.setType(EnumType.valueOf(tempString.substring(count)));
+          basicInfo.setType(EnumType.valueOf(tempString.substring(count).trim()));
         }
-        if (tempString.startsWith(CommonConstant.CSAR_PROVIDER_META)) {
+        if (meta.equalsIgnoreCase(CommonConstant.CSAR_PROVIDER_META)) {
           int count = tempString.indexOf(":") + 1;
-          basicInfo.setProvider(tempString.substring(count));
+          basicInfo.setProvider(tempString.substring(count).trim());
         }
-        if (tempString.startsWith(CommonConstant.CSAR_VERSION_META)) {
+        if (meta.equalsIgnoreCase(CommonConstant.CSAR_VERSION_META)) {
           int count = tempString.indexOf(":") + 1;
-          basicInfo.setVersion(tempString.substring(count));
+          basicInfo.setVersion(tempString.substring(count).trim());
         }
       }
       reader.close();