From b87ccbbf96a0eac4261f5a2d51c03e18b4243ddb Mon Sep 17 00:00:00 2001
From: Elena Kuleshov <evn@att.com>
Date: Wed, 22 May 2019 21:11:42 -0400
Subject: [PATCH] Handle case of null requestInfo

Handle case of null requestInfo

Issue-ID: SO-1918
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: Ie8a0dd9e27734d96442eceaa378e5d1e64667b06
---
 .../servicedecomposition/tasks/BBInputSetupMapperLayer.java  |  4 +++-
 bpmn/mso-infrastructure-bpmn/pom.xml                         | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index b90ae19ca6..6f3710835c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -335,7 +335,9 @@ public class BBInputSetupMapperLayer {
 
     public RequestContext mapRequestContext(RequestDetails requestDetails) {
         RequestContext context = new RequestContext();
-        modelMapper.map(requestDetails.getRequestInfo(), context);
+        if (null != requestDetails.getRequestInfo()) {
+            modelMapper.map(requestDetails.getRequestInfo(), context);
+        }
         org.onap.so.serviceinstancebeans.RequestParameters requestParameters = requestDetails.getRequestParameters();
         if (null != requestParameters) {
             context.setSubscriptionServiceType(requestParameters.getSubscriptionServiceType());
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index 4dd7a467ea..e9ed15aa0f 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -152,12 +152,12 @@
       <groupId>org.camunda.bpm.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
       <version>${camunda.springboot.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.camunda.bpmn</groupId>
-            <artifactId>camunda-engine-rest-core</artifactId>
-          </exclusion>
-        </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>org.camunda.bpmn</groupId>
+          <artifactId>camunda-engine-rest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
-- 
2.16.6