Fix SO Request structure

Issue-ID: POLICY-438
Change-Id: I05e634782004fff5540b3e6fabb9e22846438cb1
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>

2 files changed, 5 insertions, 0 deletions

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
index 640649800..2e7beab16 100644
--- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
@@ -59,6 +59,8 @@ public class SORequestInfo implements Serializable {
 	@SerializedName("orderVersion")

 	public Integer orderVersion;

 	

+	@SerializedName("requestorId")

+	public String requestorId;

 

 	public SORequestInfo() {

 	}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java
index 6b2017eb2..3b82edf5b 100644
--- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java
@@ -57,6 +57,9 @@ public class SOResponseWrapper implements Serializable {
         if (this == obj) {
             return true;
         }
+        if (obj == null) {
+        	return false;
+        }
         if (getClass() != obj.getClass()) {
             return false;
         }