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

Removing try/catch in the lock file acquiring algo, to avoid hanging like in case described here - https://devnet.jetbrains.com/message/5561306

Browse Source 
it should now fail and fallback to in-process compilation
This commit is contained in:
Ilya Chernikov
2015-10-25 18:40:40 +01:00
parent 2fa0988c85
commit 80fb9b8473
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
+3 -6
View File
@@ -402,12 +402,9 @@ public object KotlinCompilerClient {
val maxAttempts = COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_MS / COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_CHECK_MS + 1 val maxAttempts = COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_MS / COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_CHECK_MS + 1
var attempt = 0L var attempt = 0L
while (true) { while (true) {
try { if (lockFile.createNewFile()) break
if (lockFile.createNewFile()) break // attempt to delete if file is orphaned
// attempt to delete if file is orphaned if (lockFile.delete() && lockFile.createNewFile()) break
if (lockFile.delete() && lockFile.createNewFile()) break
}
catch (e: IOException) {} // Ignoring it - assuming it is another client process owning it
if (lockFile.exists() && ++attempt >= maxAttempts) if (lockFile.exists() && ++attempt >= maxAttempts)
throw IOException("Timeout waiting the release of the lock file '${lockFile.absolutePath}") throw IOException("Timeout waiting the release of the lock file '${lockFile.absolutePath}")
Thread.sleep(COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_CHECK_MS) Thread.sleep(COMPILE_DAEMON_STARTUP_LOCK_TIMEOUT_CHECK_MS)