Fix StmtContext nullness problems

[yangtools.git] / yang / rfc7952-parser-support / src / main / java / org / opendaylight / yangtools / rfc7952 / parser / AnnotationStatementSupport.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
index b22fb0691e84bfa457d91df9c75d115e8831c6f8..9a3337683dedfbe952df6338459e774264e0dfc9 100644 (file)
--- a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
+++ b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
@@ -50,7 +50,7 @@ public final class AnnotationStatementSupport
 
         Effective(final StmtContext<String, AnnotationStatement, ?> ctx) {
             super(ctx);
-            path = ctx.getParentContext().getSchemaPath().get().createChild(
+            path = ctx.coerceParentContext().getSchemaPath().get().createChild(
                 StmtContextUtils.parseIdentifier(ctx, argument()));
 
             final TypeEffectiveStatement<?> typeStmt = SourceException.throwIfNull(
@@ -123,7 +123,7 @@ public final class AnnotationStatementSupport
 
     @Override
     public void onStatementAdded(final Mutable<String, AnnotationStatement, AnnotationEffectiveStatement> stmt) {
-        final StatementDefinition parentDef = stmt.getParentContext().getPublicDefinition();
+        final StatementDefinition parentDef = stmt.coerceParentContext().getPublicDefinition();
         SourceException.throwIf(YangStmtMapping.MODULE != parentDef && YangStmtMapping.SUBMODULE != parentDef,
                 stmt.getStatementSourceReference(),
                 "Annotations may only be defined at root of either a module or a submodule");