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

Make getDaemonConnection synchronized to avoid racing conditions on connection

Browse Source 
Original commit: 5b5ec2cb04
This commit is contained in:
Ilya Chernikov
2015-10-14 12:10:31 +02:00
parent ba98b64776
commit a613d67074
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
+2 -2
View File
@@ -128,9 +128,9 @@ public object KotlinCompilerRunner {
internal class DaemonConnection(public val daemon: CompileService?) internal class DaemonConnection(public val daemon: CompileService?)
internal object getDaemonConnection { internal object getDaemonConnection {
private var connection: DaemonConnection? = null private @Volatile var connection: DaemonConnection? = null
operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? { @Synchronized operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? {
if (connection == null) { if (connection == null) {
val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector)
val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar"))