Merge "Added fix for potential nullpointerexception"

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 6346309..39df3d6 100644 (file)
--- 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
@@ -384,8 +384,11 @@ public class ServicePluginFactory {
 
                Map<String, Object> vpnRequestInputs = getVPNResourceRequestInputs(resources);
                // here we put client signal to vpn resource inputs
-               vpnRequestInputs.put("src-client-signal", srcClientSignal);
-               vpnRequestInputs.put("dst-client-signal", dstClientSignal);
+               if(null!=vpnRequestInputs) {
+                       vpnRequestInputs.put("src-client-signal", srcClientSignal);
+                       vpnRequestInputs.put("dst-client-signal", dstClientSignal);
+               }
+               
 
                // Now we need to query terminal points from SP resourcemgr system.
                List<Object> locationTerminalPointList = queryTerminalPointsFromServiceProviderSystem(srcLocation, dstLocation);