diff options
author | subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-04-10 14:15:39 +0000 |
---|---|---|
committer | subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-04-10 14:15:39 +0000 |
commit | 742f3f7b83078601c0ba3544fd28918bf279b530 (patch) | |
tree | 5c6ae35e8c1e3b9a6e7c728ab97c5a88157b9672 /bpmn/MSOCommonBPMN/src/main/java/org/openecomp | |
parent | 24c4169003c5a12689f3db8d7e247146d31b0046 (diff) |
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>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java/org/openecomp')
-rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java | 9 |
1 files changed, 9 insertions, 0 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 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); |