BUG-4688: Rework SchemaContext module lookups

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java
index 89a7d3149c532c40a6a87ac5b1d1ec08f31f2280..f8265bed56cbd4df1bb011b9e785c146922c54bb 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java
@@ -16,7 +16,6 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@ -156,8 +155,7 @@ class LeafRefContextTreeBuilder {
         while (baseLeafRefType.getBaseType() != null) {
             baseLeafRefType = baseLeafRefType.getBaseType();
         }
-        final QNameModule module = baseLeafRefType.getQName().getModule();
-        return schemaContext.findModuleByNamespaceAndRevision(module.getNamespace(), module.getRevision());
+        return schemaContext.findModule(baseLeafRefType.getQName().getModule()).orElse(null);
     }
 
     private LeafRefContext buildLeafRefContextReferencedByTree(