BUG-4688: Rework SchemaContext module lookups

[yangtools.git] / yang / yang-data-jaxen / src / main / java / org / opendaylight / yangtools / yang / data / jaxen / LeafrefXPathStringParsingPathArgumentBuilder.java

diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
index e86890f0f40a81e84b34f0068368cdd9f21ae35a..e3c6c62f9e3043f62602ef3fd7e14a44e3c15764 100644 (file)
--- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
+++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java
@@ -207,16 +207,15 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder<List
     }
 
     private QName createQName(final String prefix, final String localName) {
-        final Module module = schemaContext.findModuleByNamespaceAndRevision(schemaNode.getQName().getNamespace(),
-                schemaNode.getQName().getRevision());
+        final Module module = schemaContext.findModule(schemaNode.getQName().getModule()).get();
         if (prefix.isEmpty() || module.getPrefix().equals(prefix)) {
             return QName.create(module.getQNameModule(), localName);
         }
 
         for (final ModuleImport moduleImport : module.getImports()) {
             if (prefix.equals(moduleImport.getPrefix())) {
-                final Module importedModule = schemaContext.findModuleByName(moduleImport.getModuleName(),
-                        moduleImport.getRevision());
+                final Module importedModule = schemaContext.findModule(moduleImport.getModuleName(),
+                        moduleImport.getRevision()).get();
                 return QName.create(importedModule.getQNameModule(),localName);
             }
         }