X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FPolicyEntity.java;h=c262aec4ea7cc0c5bf2f1557420fa8808d8707d2;hb=401b48bc573561f097960a9ca7abe6d788456f28;hp=57daf7ed8d0138107df903437cbb12520da007d0;hpb=6065432f5eb35d70466e1eead8c78124ec3cf62e;p=policy%2Fengine.git

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
index 57daf7ed8..c262aec4e 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
@@ -310,22 +310,20 @@ public class PolicyEntity implements Serializable {
 
 		PolicyEntity p = (PolicyEntity) obj;
 		
-		return (
-				policyId == p.policyId &&
+		return policyId == p.policyId &&
 				policyName.equals(p.policyName) &&
 				scope.equals(p.scope) &&
 				version == p.version &&
 				policyVersion == p.policyVersion &&
 				policyData.equals(p.policyData) &&
-				((configurationDataEntity == null && p.configurationDataEntity == null) || configurationDataEntity.equals(p.configurationDataEntity)) &&
-				((actionBodyEntity == null && p.actionBodyEntity == null) || actionBodyEntity.equals(p.actionBodyEntity)) &&
+				((configurationDataEntity == null && p.configurationDataEntity == null) || (configurationDataEntity!=null && configurationDataEntity.equals(p.configurationDataEntity))) &&
+				((actionBodyEntity == null && p.actionBodyEntity == null) || (actionBodyEntity!=null && actionBodyEntity.equals(p.actionBodyEntity))) &&
 				createdBy.equals(p.createdBy) &&
 				createdDate.equals(p.createdDate) &&
 				description.equals(p.description) &&
 				modifiedBy.equals(p.modifiedBy) &&
 				modifiedDate.equals(p.modifiedDate) &&
-				deleted == p.deleted
-				);
+				deleted == p.deleted;
 	}