From e709b0f3f6cd9a93a46632a5f4d64f58f2955f83 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 25 Dec 2014 20:00:28 +0300
Subject: [PATCH] Don't store class loader in CompilerEnvironment

Modules jps-plugin and ide-compiler-runner are loaded by the same class loader

Original commit: 0d671141d0b7121b3e8be33b2d78c1802ce40be7
---
 .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
index a2d0fef9845..122c01b7ea0 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
@@ -169,16 +169,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
                 .register(javaClass<IncrementalCacheProvider>(), IncrementalCacheProviderImpl(incrementalCaches))
                 .build()
 
-        val environment = CompilerEnvironment.getEnvironmentFor(
+        return CompilerEnvironment.getEnvironmentFor(
                 PathUtil.getKotlinPathsForJpsPluginOrJpsTests(),
-                javaClass.getClassLoader(),
                 { className ->
-                    className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
+                    className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
                     || className == "org.jetbrains.jet.config.Services"
                 },
                 compilerServices
         )
-        return environment
     }
 
     private fun getOutputItemsAndTargets(