Passing services via type-safe container instead of map.

2014-08-19 20:49:48 +04:00
parent 184ddbc9e1
commit f3b7ae379f
9 changed files with 75 additions and 28 deletions
@@ -77,7 +77,8 @@ public class ClassPreloadingUtils {
            public Class<?> loadClass(String name) throws ClassNotFoundException {
                // When compiler is invoked from JPS, we should use loaded incremental cache interface from its class loader,
                // because implementation is loaded from it, as well
-                if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")) {
+                if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") ||
+                    name.equals("org.jetbrains.jet.config.CompilerServices")) {
                    if (parent == null) {
                        return super.loadClass(name);
                    }