Bug 5968: Mandatory leaf enforcement does not work in some cases

Fix of possible IllegalStateException.

Change-Id: Ide4d1bf060dc7ff8fc6286d5a1de03f8a6bedbfc
Signed-off-by: Peter Kajsa <pkajsa@cisco.com>
(cherry picked from commit 3e4972b4e8edd7387666808014cd33daddef2cb5)

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
index e1757a0a7441a450d7e35bb73147eff0f03effc9..653bf82635d9f1ef8f9722c718ed8a1a1d606417 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
@@ -296,7 +296,10 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
              * cases full validation is performed only once just here.
              */
             case MERGE:
-                schema.verifyStructure(schema.apply(this, getOriginal(), version).get().getData(), true);
+                final Optional<TreeNode> result = schema.apply(this, getOriginal(), version);
+                if (result.isPresent()) {
+                    schema.verifyStructure(result.get().getData(), true);
+                }
                 break;
             default:
                 break;