diff options
| author |   Steve Smokowski <ss835w@att.com> | 2018-12-12 12:50:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-12 12:50:16 +0000 |
| commit | d86091c0a9c1aaeb46bf15475a5f9324e3a84ba8 (patch) | |
| tree | 44abb9e71f38851083a8ab8049eb1b96193ddaa6 /bpmn/so-bpmn-infrastructure-common | |
| parent | 5d015004a0348d332798665c57dcf5a37220a107 (diff) | |
| parent | 89042f16b0d85bb77850741929d47f3678c8b6c4 (diff) | |
Merge "added check for null object"
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-common')
| -rw-r--r-- | bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java index 7f1c2fd9b1..ac341886ba 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java +++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java @@ -622,7 +622,9 @@ public class ServicePluginFactory { // in demo we have only one VPN. no cross VPNs, so get first item. Map<String, Object> returnRoute = getReturnRoute(returnList); Map<String, Object> vpnRequestInputs = getVPNResourceRequestInputs(resources); - vpnRequestInputs.putAll(returnRoute); + if(null!=vpnRequestInputs) { + vpnRequestInputs.putAll(returnRoute); + } String newRequest = getJsonString(uuiObject); return newRequest; } |