diff --git a/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java index 636d1942917..3c30af56cbd 100644 --- a/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/MemoryBasedClassLoader.java @@ -112,11 +112,21 @@ public class MemoryBasedClassLoader extends ClassLoader { @Override public Enumeration getResources(String name) throws IOException { - Enumeration resources = super.getResources(name); - if (!resources.hasMoreElements() && parent != null) { - return parent.getResources(name); + Enumeration own = super.getResources(name); + if (parent == null) return own; + + Enumeration fromParent = parent.getResources(name); + if (!own.hasMoreElements()) return fromParent; + + List result = new ArrayList(); + while (own.hasMoreElements()) { + result.add(own.nextElement()); } - return resources; + while (fromParent.hasMoreElements()) { + result.add(fromParent.nextElement()); + } + + return Collections.enumeration(result); } @Override