From df89aef86b27f0895f2497be11986a097abe7e61 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 11 Dec 2013 16:28:43 +0100 Subject: [PATCH] Added more granular error reporting during commit validation. Change-Id: I96a9f2fdd256e1b394d3a21fbaccf16f7350d316 Signed-off-by: Tony Tkacik --- .../org/opendaylight/yangtools/yang/util/YangSchemaUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java index 44ee2a31b0..3ff1d1d6cb 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java @@ -80,10 +80,11 @@ public class YangSchemaUtils { checkArgument(!iterator.hasNext(), "Path nests inside leaf node, which is not allowed."); return currentNode; } + checkState(currentNode != null, "Current node should not be null for %s",path); } + checkState(previous instanceof DataSchemaNode, "Schema node for %s should be instance of DataSchemaNode. Found %s",path,previous); return (DataSchemaNode) previous; } - private static DataSchemaNode searchInChoices(DataNodeContainer node, QName arg) { Set children = node.getChildNodes(); -- 2.36.6