X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2Feffective%2FDeclaredEffectiveStatementBase.java;h=6cc7101115ccfa89d248c54e82c9e8e45784bef7;hb=refs%2Fchanges%2F11%2F58711%2F2;hp=71912a2099c1ed260268bea5ce552a86b24bf444;hpb=7c9b9c8e6056728e77f486f266cbccfece9d72eb;p=yangtools.git
diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeclaredEffectiveStatementBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeclaredEffectiveStatementBase.java
index 71912a2099..6cc7101115 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeclaredEffectiveStatementBase.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeclaredEffectiveStatementBase.java
@@ -13,7 +13,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase;
public abstract class DeclaredEffectiveStatementBase> extends
EffectiveStatementBase {
@@ -28,7 +27,7 @@ public abstract class DeclaredEffectiveStatementBase ctx) {
+ protected DeclaredEffectiveStatementBase(final StmtContext ctx) {
super(ctx);
this.argument = ctx.getStatementArgument();
@@ -40,12 +39,9 @@ public abstract class DeclaredEffectiveStatementBase originalCtx = (StatementContextBase) ctx.getOriginalCtx();
- if (originalCtx != null) {
- ctx = originalCtx;
- }
- declaredInstance = Verify.verifyNotNull(ctx.buildDeclared(), "Statement %s failed to build declared statement",
- ctx);
+ final StmtContext, D, ?> lookupCtx = (StmtContext, D, ?>) ctx.getOriginalCtx().orElse(ctx);
+ declaredInstance = Verify.verifyNotNull(lookupCtx.buildDeclared(),
+ "Statement %s failed to build declared statement", lookupCtx);
}
@Nonnull