From: YuanHu <yuan.hu1@zte.com.cn>
Date: Tue, 6 Sep 2016 03:09:48 +0000 (+0800)
Subject: NullPointer Protected while plan is empty.
X-Git-Tag: release/sun~60^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fdd9882d31ca618a2e1e1e8dc3f09c11b2097642;p=vfc%2Fnfvo%2Fcatalog.git

NullPointer Protected while plan is empty.

Change-Id: I124e06b671fea5305c617483c64547e91c2fe212
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java
index 5075f485..e64a6abb 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/entity/ParseYamlResult.java
@@ -153,7 +153,10 @@ public class ParseYamlResult {
   }
 
   private List<Plan> jsonObject2PlanList(JsonObject plans) {
-    List<Plan> retList = new ArrayList<Plan>();
+    if (plans == null) {
+      return new ArrayList<>();
+    }
+    List<Plan> retList = new ArrayList<>();
     Iterator<Entry<String, JsonElement>> iterator = plans.entrySet().iterator();
     while (iterator.hasNext()) {
       Plan ret = new Plan();