From 742f3f7b83078601c0ba3544fd28918bf279b530 Mon Sep 17 00:00:00 2001
From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Tue, 10 Apr 2018 14:15:39 +0000
Subject: Fix exception case in null return

Fix exception case in null return.

Change-Id: I7f6a0ec3c372e34c1f04468be729d1cbc079e991
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---
 .../mso/bpmn/common/resource/ResourceRequestBuilder.java         | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'bpmn/MSOCommonBPMN')

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);
-- 
cgit 1.2.3-korg