Issue fix for RestconfApiCallNode

[ccsdk/sli/plugins.git] / restconf-client / provider / src / main / java / org / onap / ccsdk / sli / plugins / yangserializers / dfserializer / MdsalSerializerHelper.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java
index 6f9f907..1fd0d2d 100644 (file)
--- a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java
+++ b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java
@@ -274,11 +274,12 @@ public class MdsalSerializerHelper extends SerializerHelper<SchemaNode, SchemaCo
         if (curSchemaNode instanceof DataSchemaNode) {
             Deque<DataSchemaNode> dataSchema = findSchemaNodeByNameAndNamespace(
                     (DataSchemaNode) curSchemaNode, name, namespace.moduleNs());
+
             if (dataSchema != null && !dataSchema.isEmpty()) {
                 childNode = dataSchema.pop();
             }
 
-            if (!dataSchema.isEmpty()) {
+            if (dataSchema != null && !dataSchema.isEmpty()) {
                 childNode = findSchemaForChild(((ChoiceSchemaNode) childNode),
                                                qname);
             }