diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-05-18 01:45:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-18 01:45:23 +0000 |
| commit | a7bb859dae6482167ba80794743704e060e51797 (patch) | |
| tree | 42d9c76cd0544ed8a311141518cd987ccced1d68 /bpmn/MSOCommonBPMN/src/main | |
| parent | c82216b0be5e2fab57031056d386a192b6abbce2 (diff) | |
| parent | 2f6280fad067a92700f61c3f82ec709038fff9a0 (diff) | |
Merge "Fix resource building logic"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java | 6 |
1 files changed, 5 insertions, 1 deletions
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<String, Object> serviceInput =getJsonObject((String)JsonUtils.getJsonValue(serviceParameters, "requestInputs"), Map.class); + Map<String, Object> serviceInput = null; + if (JsonUtils.getJsonValue(serviceParameters, "requestInputs") != null) { + serviceInput = getJsonObject((String)JsonUtils.getJsonValue(serviceParameters, "requestInputs"), Map.class); + } + Map<String, Object> resourceInputsFromUuiMap = getJsonObject(resourceInputsFromUui, Map.class); if (serviceInput == null) { |