resolving for the metamodel needs to take account of overrides

Part of ceylon/ceylon-dist#61
ceylon · Nov 13, 2015 · bebfff9 · bebfff9
1 parent ae3dd66
commit bebfff9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/runtime/com/redhat/ceylon/compiler/java/runtime/model/RuntimeModuleManager.java b/runtime/com/redhat/ceylon/compiler/java/runtime/model/RuntimeModuleManager.java
@@ -13,6 +13,7 @@
 import com.redhat.ceylon.model.loader.impl.reflect.model.ReflectionModuleManager;
 import com.redhat.ceylon.model.loader.model.LazyModule;
 import com.redhat.ceylon.model.loader.model.LazyPackage;
+import com.redhat.ceylon.model.typechecker.model.ModelUtil;
 import com.redhat.ceylon.model.typechecker.model.Module;
 import com.redhat.ceylon.model.typechecker.model.ModuleImport;
 import com.redhat.ceylon.model.typechecker.model.Modules;
@@ -109,6 +110,14 @@ public boolean loadModule(String name, String version,
         }
     }
 
+    @Override
+    public Module getOrCreateModule(List<String> moduleName, String version) {
+        ModuleLoader contextModuleLoader = org.jboss.modules.Module.getContextModuleLoader();
+        if (contextModuleLoader instanceof RuntimeResolver) {
+            version = ((RuntimeResolver)contextModuleLoader).resolveVersion(ModelUtil.formatPath(moduleName), version);
+        }
+        return super.getOrCreateModule(moduleName, version);
+    }
     @Override
     public RuntimeModelLoader getModelLoader() {
         return (RuntimeModelLoader) super.getModelLoader();