MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix classes collision in classpath

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-11-03 20:36:28 +01:00
parent fbfc407229
commit 5139885969
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java
+3 -3
View File
@@ -68,7 +68,6 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.groovy.compiler.rt.CompilerMessage;
import org.jetbrains.groovy.compiler.rt.GroovycRunner;
import org.jetbrains.jps.incremental.groovy.GroovycOSProcessHandler;
import org.jetbrains.jps.incremental.messages.BuildMessage;
@@ -110,6 +109,9 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler {
final JavaParameters parameters = new JavaParameters();
final PathsList classPathBuilder = parameters.getClassPath();
// IMPORTANT: must be the first entry to avoid collisions
classPathBuilder.add(PathUtil.getJarPathForClass(GroovycRunner.class));
final ModuleChunk chunk = createChunk(module, compileContext);
final Library[] libraries = GroovyConfigUtils.getInstance().getSDKLibrariesByModule(module);
@@ -124,8 +126,6 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler {
appendOutputPath(module, classPathBuilder, true);
}
classPathBuilder.add(PathUtil.getJarPathForClass(GroovycRunner.class));
final List<String> patchers = new SmartList<String>();
AccessToken accessToken = ApplicationManager.getApplication().acquireReadActionLock();