From 1152a75dbe0c97e50052bf835d1888bd7cc06963 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Wed, 13 Aug 2014 09:05:20 +0200 Subject: [PATCH] Make buildModules() in YangParser behave same as other methods Submodules were not resolved Change-Id: Ifaac3b7f95883f190874cf91f8837c697c6c33e7 Signed-off-by: Maros Marsalek --- .../yangtools/yang/parser/impl/YangParserImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index d0335a4667..1ed5986df5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -329,10 +329,10 @@ public final class YangParserImpl implements YangContextParser { } public Collection buildModules(final Collection builders) { - List sorted = ModuleDependencySort.sort(builders); + Collection unsorted = resolveSubmodules(builders); + List sorted = ModuleDependencySort.sort(unsorted); Map> modules = resolveModulesWithImports(sorted, null); Map builderToModule = build(modules); - return builderToModule.values(); } -- 2.36.6