From 0c4e23e4387ab4fbe5d4d920ef42f4033ee86b66 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 23 Jul 2012 17:16:16 +0400
Subject: [PATCH] Added assertion in JetCoreEnvironment.addToClasspath()
 prohibiting to invoke it when environment is initialized.

---
 .../jet/cli/jvm/compiler/JetCoreEnvironment.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index 5c073b581d1..fd52fbf1627 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
@@ -41,8 +41,6 @@ import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,6 +51,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
     private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
     private final CoreAnnotationsProvider annotationsProvider;
     private final CompilerConfiguration configuration;
+    private boolean initialized = false;
 
     @NotNull
     public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) {
@@ -96,6 +95,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         }
 
         JetStandardLibrary.initialize(getProject());
+        initialized = true;
     }
 
     public CompilerConfiguration getConfiguration() {
@@ -146,6 +146,14 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         addSources(new File(path));
     }
 
+    @Override
+    public void addToClasspath(File path) {
+        if (initialized) {
+            throw new IllegalStateException("Cannot add class path when JetCoreEnvironment is already initialized");
+        }
+        super.addToClasspath(path);
+    }
+
     public List<JetFile> getSourceFiles() {
         return sourceFiles;
     }