From 37c3705d7a7d6ad1df851c325f3401b0df9e8a74 Mon Sep 17 00:00:00 2001 From: Igor Foltin Date: Tue, 20 Jun 2017 16:01:17 +0200 Subject: [PATCH] Fix uninitialized ExtensionDefinition for openconfig-version The StatementDefinition for openconfig-version extension is not bound to any revision. When populating the ExtensionNamespace with openconfig-version, we have to store it with a revisionless QName key. This way we can properly extract the corresponding ExtensionDefinition later down the road in the UnknownEffectiveStatementBase. This issue causes NPE in MDSAL's binding generator v2. Change-Id: Ie24c09b56986c87b5118d715ec6c8e755cf07ebe Signed-off-by: Igor Foltin --- .../yang/parser/stmt/rfc6020/ExtensionStatementImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java index 761f11c81d..59929a10c3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java @@ -63,7 +63,12 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement imp public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) { super.onStatementDefinitionDeclared(stmt); - stmt.addContext(ExtensionNamespace.class, stmt.getStatementArgument(), stmt); + QName stmtName = stmt.getStatementArgument(); + if (SupportedExtensionsMapping.OPENCONFIG_VERSION.getStatementName().isEqualWithoutRevision(stmtName)) { + stmtName = stmtName.withoutRevision(); + } + + stmt.addContext(ExtensionNamespace.class, stmtName, stmt); final StmtContext argument = StmtContextUtils.findFirstDeclaredSubstatement(stmt, ArgumentStatement.class); -- 2.36.6