aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-04-11 06:59:43 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-11 06:59:43 +0000
commitda2d45824cc422ddc501f7fefbe675b8b5ea6d9e (patch)
treee613d6c74e70a7414763eb650a6cbb981a458ed7 /bpmn/MSOCommonBPMN
parent3ec698cc52cfd1d9673c2bf2301c2c4fe2a8543f (diff)
parent742f3f7b83078601c0ba3544fd28918bf279b530 (diff)
Merge "Fix exception case in null return"
Diffstat (limited to 'bpmn/MSOCommonBPMN')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java9
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);