From: YuanHu <yuan.hu1@zte.com.cn>
Date: Wed, 7 Mar 2018 09:13:17 +0000 (+0800)
Subject: Fixed the bugs checked by sonar.
X-Git-Tag: v1.1.0~72
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=548e5f5ed2ad5a7c8ac29a6f5245c4779bb28f11;p=sdc%2Fsdc-workflow-designer.git

Fixed the bugs checked by sonar.

Add null pointer detected and protected.

Issue-ID: SDC-1079

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

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
index 1b3a8779..d214b389 100644
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
@@ -158,6 +158,11 @@ public class Bpmn4ToscaJsonParser {
         Element element;
 
         String nodeType = getValueFromJsonNode(jsonNode, JsonKeys.TYPE);
+        if (nodeType == null) {
+          log.warn("Ignoring node: type is null");
+          return null;
+        }
+        
         switch (nodeType) {
         case "startEvent":
             element = MAPPER.readValue(jsonObject, StartEvent.class);