From 9386579264e640c804ed79dd03a41e55fd0472e9 Mon Sep 17 00:00:00 2001
From: nancylizi
Date: Thu, 13 Oct 2016 12:39:32 +0800
Subject: Fix the problem "when upload package throws an exception "String
index out of range: -1"
Change-Id: I594c2e47b104d237390dc9f45d4447e3129f2594
Issue-id:TOSCA-115
Signed-off-by: nancylizi
---
.../catalog/wrapper/PackageWrapperUtil.java | 28 ++++++++++++----------
1 file changed, 15 insertions(+), 13 deletions(-)
(limited to 'catalog-core/catalog-mgr/src/main/java')
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 763e2009..3ae5fef1 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,19 +403,21 @@ public class PackageWrapperUtil {
reader = new BufferedReader(new FileReader(file));
String tempString = null;
while ((tempString = reader.readLine()) != null) {
- 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).trim()));
- }
- if (meta.equalsIgnoreCase(CommonConstant.CSAR_PROVIDER_META)) {
- int count = tempString.indexOf(":") + 1;
- basicInfo.setProvider(tempString.substring(count).trim());
- }
- if (meta.equalsIgnoreCase(CommonConstant.CSAR_VERSION_META)) {
- int count = tempString.indexOf(":") + 1;
- basicInfo.setVersion(tempString.substring(count).trim());
+ if (!tempString.equals("")) {
+ 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).trim()));
+ }
+ if (meta.equalsIgnoreCase(CommonConstant.CSAR_PROVIDER_META)) {
+ int count = tempString.indexOf(":") + 1;
+ basicInfo.setProvider(tempString.substring(count).trim());
+ }
+ if (meta.equalsIgnoreCase(CommonConstant.CSAR_VERSION_META)) {
+ int count = tempString.indexOf(":") + 1;
+ basicInfo.setVersion(tempString.substring(count).trim());
+ }
}
}
reader.close();
--
cgit 1.2.3-korg