From: Chandan Ghosh <cghosh12@in.ibm.com>
Date: Mon, 3 Dec 2018 09:18:02 +0000 (+0530)
Subject: added check for null object
X-Git-Tag: 1.4.1~399^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F74123%2F1;p=so.git

added check for null object

added check for null object reported in sonar

Issue-ID: SO-1263
Change-Id: I80409dfeb3a7b3f73058cf909710c03a42da6293
Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
---

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;
 	}