Merge changes Id525d532,I91723b83

[clamp.git] / src / main / java / org / onap / clamp / policy / operational / OperationalPolicyRepresentationBuilder.java

diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 8bd8aac..5f6cb31 100644 (file)
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -319,7 +319,7 @@ public class OperationalPolicyRepresentationBuilder {
 
         if (TYPE_LIST.equalsIgnoreCase(type)) {
             property.addProperty(TYPE, "array");
-            if (cdsProperty.get(PROPERTIES) != null) {
+            if (cdsProperty != null && cdsProperty.get(PROPERTIES) != null) {
                 JsonObject dataObject = new JsonObject();
                 addDataFields(cdsProperty.get(PROPERTIES).getAsJsonObject(),
                               dataObject);