Fix StmtContext nullness problems

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / belongs_to / BelongsToStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
index b7511f69ea50366b42bf69fb8e516a203dad72d8..29bd851a2030874f01d3a90ca606bd4193182cb2 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
@@ -74,7 +74,7 @@ public final class BelongsToStatementSupport extends
 
         final SourceIdentifier belongsToSourceIdentifier = getSourceIdentifier(belongsToCtx);
         final Prerequisite<StmtContext<?, ?, ?>> belongsToPrereq = belongsToAction.requiresCtx(belongsToCtx,
-            ModuleNamespaceForBelongsTo.class, belongsToCtx.getStatementArgument(),
+            ModuleNamespaceForBelongsTo.class, belongsToCtx.coerceStatementArgument(),
             ModelProcessingPhase.SOURCE_LINKAGE);
 
         belongsToAction.apply(new InferenceAction() {
@@ -84,7 +84,7 @@ public final class BelongsToStatementSupport extends
 
                 belongsToCtx.addToNs(BelongsToModuleContext.class, belongsToSourceIdentifier, belongsToModuleCtx);
                 belongsToCtx.addToNs(BelongsToPrefixToModuleCtx.class,
-                    findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).getStatementArgument(),
+                    findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).coerceStatementArgument(),
                     belongsToModuleCtx);
             }
 
@@ -100,7 +100,7 @@ public final class BelongsToStatementSupport extends
 
     private static SourceIdentifier getSourceIdentifier(final StmtContext<String, BelongsToStatement,
             EffectiveStatement<String, BelongsToStatement>> belongsToCtx) {
-        return RevisionSourceIdentifier.create(belongsToCtx.getStatementArgument());
+        return RevisionSourceIdentifier.create(belongsToCtx.coerceStatementArgument());
     }
 
     @Override