Refactor EffectiveStmtCtx.Parent.schemaPath()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
index a2881ba88e41bd6d88dc0bdfb1c9bd75ea03c4a8..3020a74172b92cb39b29c7dcfec33085b7cad285 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatementImpl.java
@@ -38,8 +38,8 @@ final class UnrecognizedEffectiveStatementImpl extends UnknownEffectiveStatement
 
         SchemaPath maybePath;
         try {
-            maybePath = stmt.getEffectiveParent().schemaPath()
-                    .map(parentPath -> parentPath.createChild(maybeQNameArgument)).orElse(null);
+            final SchemaPath parentPath = stmt.getEffectiveParent().schemaPath();
+            maybePath = parentPath == null ? null : parentPath.createChild(maybeQNameArgument);
         } catch (IllegalArgumentException | SourceException e) {
             LOG.debug("Cannot construct path for {}, attempting to recover", stmt, e);
             maybePath = null;