Merge "added check for null object"

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