Added null check for injectedVariables to prevent

crash at call of injectedVariables.get()

Issue-ID: SO-1841
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Change-Id: I1d05b32b0aa0c001c79e41576bc8b3435a9aae1f

diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
index 389f931..e71404a 100644 (file)
--- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
+++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
@@ -350,10 +350,12 @@ public abstract class WorkflowTest {
              */
 
             try {
-                msoRequestId = (String) injectedVariables.get("requestId");
-                variables.put("mso-request-id", msoRequestId);
-                msoServiceInstanceId = (String) injectedVariables.get("serviceInstanceId");
-                variables.put("mso-service-instance-id", msoServiceInstanceId);
+                if (injectedVariables != null) {
+                    msoRequestId = (String) injectedVariables.get("requestId");
+                    variables.put("mso-request-id", msoRequestId);
+                    msoServiceInstanceId = (String) injectedVariables.get("serviceInstanceId");
+                    variables.put("mso-service-instance-id", msoServiceInstanceId);
+                }
             } catch (Exception e) {
             }
             if (msoRequestId == null || msoRequestId.trim().equals("")) {