From: Seshu Kumar M <seshu.kumar.m@huawei.com>
Date: Wed, 11 Apr 2018 06:59:43 +0000 (+0000)
Subject: Merge "Fix exception case in null return"
X-Git-Tag: v1.2.1~188
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=da2d45824cc422ddc501f7fefbe675b8b5ea6d9e;hp=3ec698cc52cfd1d9673c2bf2301c2c4fe2a8543f;p=so.git

Merge "Fix exception case in null return"
---

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
index 74a3252768..9aa17930c0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
@@ -93,6 +93,15 @@ public class ResourceRequestBuilder {
         }
         Map<String, Object> serviceInput =getJsonObject((String)JsonUtils.getJsonValue(serviceParameters, "requestInputs"), Map.class);
         Map<String, Object> resourceInputsFromUuiMap = getJsonObject(resourceInputsFromUui, Map.class);
+
+        if (serviceInput == null) {
+            serviceInput = new HashMap();
+        }
+
+        if (resourceInputsFromUuiMap == null) {
+            resourceInputsFromUuiMap = new HashMap();
+        }
+
         try {
             Map<String, Object> resourceInputsFromServiceDeclaredLevel = buildResouceRequest(serviceUuid, resourceCustomizationUuid, serviceInput);
             resourceInputsFromUuiMap.putAll(resourceInputsFromServiceDeclaredLevel);