Skip to content

Commit 0c4e23e

Browse files
Evgeny GerashchenkoEvgeny Gerashchenko
Evgeny Gerashchenko
authored and
Evgeny Gerashchenko
committed
Added assertion in JetCoreEnvironment.addToClasspath() prohibiting to invoke it when environment is initialized.
1 parent 7f12dcb commit 0c4e23e

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import org.jetbrains.jet.utils.PathUtil;
4242

4343
import java.io.File;
44-
import java.net.URL;
45-
import java.net.URLClassLoader;
4644
import java.util.ArrayList;
4745
import java.util.List;
4846

@@ -53,6 +51,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
5351
private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
5452
private final CoreAnnotationsProvider annotationsProvider;
5553
private final CompilerConfiguration configuration;
54+
private boolean initialized = false;
5655

5756
@NotNull
5857
public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) {
@@ -96,6 +95,7 @@ public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerConfigur
9695
}
9796

9897
JetStandardLibrary.initialize(getProject());
98+
initialized = true;
9999
}
100100

101101
public CompilerConfiguration getConfiguration() {
@@ -146,6 +146,14 @@ private void addSources(String path) {
146146
addSources(new File(path));
147147
}
148148

149+
@Override
150+
public void addToClasspath(File path) {
151+
if (initialized) {
152+
throw new IllegalStateException("Cannot add class path when JetCoreEnvironment is already initialized");
153+
}
154+
super.addToClasspath(path);
155+
}
156+
149157
public List<JetFile> getSourceFiles() {
150158
return sourceFiles;
151159
}

0 commit comments

Comments
 (0)