From 2f6280fad067a92700f61c3f82ec709038fff9a0 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Thu, 17 May 2018 15:29:22 +0000 Subject: Fix resource building logic Fix resource building logic. Change-Id: I95064d945a6ff026a0ea10336a550d9bb8af401a Issue-ID: SO-624 Signed-off-by: subhash kumar singh --- .../openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (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 bee476526c..e6b1b2143f 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 @@ -94,7 +94,11 @@ public class ResourceRequestBuilder { resourceInputsFromUui = JsonUtils.getJsonValue(resourceParameters, "requestInputs"); } } - Map serviceInput =getJsonObject((String)JsonUtils.getJsonValue(serviceParameters, "requestInputs"), Map.class); + Map serviceInput = null; + if (JsonUtils.getJsonValue(serviceParameters, "requestInputs") != null) { + serviceInput = getJsonObject((String)JsonUtils.getJsonValue(serviceParameters, "requestInputs"), Map.class); + } + Map resourceInputsFromUuiMap = getJsonObject(resourceInputsFromUui, Map.class); if (serviceInput == null) { -- cgit 1.2.3-korg