azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synchronize access to mutable class loader reference in CompilerRunnerUtil

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-24 18:02:19 +03:00
parent 51e9675138
commit 9807643b0e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java
+14 -5
View File
@@ -45,6 +45,19 @@ public class CompilerRunnerUtil {
private static SoftReference<ClassLoader> ourClassLoaderRef = new SoftReference<ClassLoader>(null); private static SoftReference<ClassLoader> ourClassLoaderRef = new SoftReference<ClassLoader>(null);
@NotNull
private static synchronized ClassLoader getOrCreateClassLoader(
@NotNull CompilerEnvironment environment,
@NotNull File libPath
) throws IOException {
ClassLoader classLoader = ourClassLoaderRef.get();
if (classLoader == null) {
classLoader = createClassLoader(libPath, environment.getParentClassLoader(), environment.getClassesToLoadByParent());
ourClassLoaderRef = new SoftReference<ClassLoader>(classLoader);
}
return classLoader;
}
@Nullable @Nullable
private static File getLibPath(@NotNull KotlinPaths paths, @NotNull MessageCollector messageCollector) { private static File getLibPath(@NotNull KotlinPaths paths, @NotNull MessageCollector messageCollector) {
File libs = paths.getLibPath(); File libs = paths.getLibPath();
@@ -130,11 +143,7 @@ public class CompilerRunnerUtil {
File libPath = getLibPath(environment.getKotlinPaths(), messageCollector); File libPath = getLibPath(environment.getKotlinPaths(), messageCollector);
if (libPath == null) return null; if (libPath == null) return null;
ClassLoader classLoader = ourClassLoaderRef.get(); ClassLoader classLoader = getOrCreateClassLoader(environment, libPath);
if (classLoader == null) {
classLoader = createClassLoader(libPath, environment.getParentClassLoader(), environment.getClassesToLoadByParent());
ourClassLoaderRef = new SoftReference<ClassLoader>(classLoader);
}
Class<?> kompiler = Class.forName(compilerClassName, true, classLoader); Class<?> kompiler = Class.forName(compilerClassName, true, classLoader);
Method exec = kompiler.getMethod( Method exec = kompiler.getMethod(