From 5139885969cf4ff24af4f932eef549eff84c028a Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 2 Nov 2011 21:22:12 +0100 Subject: [PATCH] fix classes collision in classpath --- .../plugins/groovy/compiler/GroovyCompilerBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java index b23257f9b9a2..678490e08008 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java @@ -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 patchers = new SmartList(); AccessToken accessToken = ApplicationManager.getApplication().acquireReadActionLock();