Metamodel: use a module list view to avoid concurrent exceptions #347

ceylon · Apr 10, 2014 · 9247a14 · 9247a14
1 parent 63e0aa7
commit 9247a14
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/Metamodel.java b/runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/Metamodel.java
@@ -761,9 +761,11 @@ public static int getVariadicParameter(List<Parameter> parameters) {
     public static Sequential<? extends ceylon.language.meta.declaration.Module> getModuleList() {
         // FIXME: this probably needs synchronisation to avoid new modules loaded during traversal
         Set<com.redhat.ceylon.compiler.typechecker.model.Module> modules = moduleManager.getContext().getModules().getListOfModules();
-        ceylon.language.meta.declaration.Module[] array = new ceylon.language.meta.declaration.Module[modules.size()];
+        com.redhat.ceylon.compiler.typechecker.model.Module[] view = new com.redhat.ceylon.compiler.typechecker.model.Module[modules.size()];
+        modules.toArray(view);
+        ceylon.language.meta.declaration.Module[] array = new ceylon.language.meta.declaration.Module[view.length];
         int i=0;
-        for(com.redhat.ceylon.compiler.typechecker.model.Module module : modules){
+        for(com.redhat.ceylon.compiler.typechecker.model.Module module : view){
             array[i++] = getOrCreateMetamodel(module);
         }
         return Util.sequentialInstance(Module.$TypeDescriptor$, array);