X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fcodec%2Fxml%2FXmlDocumentUtils.java;h=87a6181b525a8a93b14c51a5f488db0e91daea79;hb=d0c139c15f144e40ffffbcdf51dd8db11fc6fa6d;hp=2fb4a44c8a573dcc0a95ff500a8168b9e0147e42;hpb=fac279fb825a3299797e525b5eae6ac122825184;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
index 2fb4a44c8a..87a6181b52 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
@@ -363,7 +363,7 @@ public class XmlDocumentUtils {
                 } else if (dsn instanceof ChoiceNode) {
                     for (ChoiceCaseNode choiceCase : ((ChoiceNode) dsn).getCases()) {
                         Optional<DataSchemaNode> foundDsn = findFirstSchema(qname, choiceCase.getChildNodes());
-                        if (foundDsn != null) {
+                        if (foundDsn != null && foundDsn.isPresent()) {
                             return foundDsn;
                         }
                     }