BUG-4688: Rework SchemaContext module lookups

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / leafref / LeafRefContextBuilder.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java
index 23f585b6de64fee388db44e9214e95a27bf31099..8dfe80e22fa26ccd6bf30bb473d0d8bbd1ae9882 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java
@@ -146,14 +146,12 @@ class LeafRefContextBuilder implements Builder<LeafRefContext> {
     }
 
     public LeafRefPath getAbsoluteLeafRefTargetPath() {
-
         if (isReferencing && absoluteLeafRefTargetPath == null) {
             if (leafRefTargetPath.isAbsolute()) {
                 absoluteLeafRefTargetPath = leafRefTargetPath;
             } else {
-                absoluteLeafRefTargetPath = LeafRefUtils
-                        .createAbsoluteLeafRefPath(leafRefTargetPath,
-                                currentNodePath, getLeafRefContextModule());
+                absoluteLeafRefTargetPath = LeafRefUtils.createAbsoluteLeafRefPath(leafRefTargetPath,
+                    currentNodePath, getLeafRefContextModule());
             }
         }
 
@@ -163,8 +161,7 @@ class LeafRefContextBuilder implements Builder<LeafRefContext> {
     public Module getLeafRefContextModule() {
         final Iterator<QName> it = currentNodePath.getPathFromRoot().iterator();
         final QNameModule qnameModule = it.hasNext() ? it.next().getModule() : currentNodeQName.getModule();
-
-        return schemaContext.findModuleByNamespaceAndRevision(qnameModule.getNamespace(), qnameModule.getRevision());
+        return schemaContext.findModule(qnameModule).orElse(null);
     }
 
     public void addReferencedByLeafRefCtx(final QName qname, final LeafRefContext leafRef) {