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

minor: Fix daemon shutdown livelock

Browse Source 
due to wrong minimal aliveness, daemon was in some situations livelocked
in the last session state on shutdown.
This commit is contained in:
Ilya Chernikov
2017-04-05 10:07:22 +02:00
parent 30048f8f49
commit 659002f5ce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+1 -1
View File
@@ -259,7 +259,7 @@ class CompileServiceImpl(
CompileService.CallResult.Ok() CompileService.CallResult.Ok()
} }
override fun scheduleShutdown(graceful: Boolean): CompileService.CallResult<Boolean> = ifAlive(minAliveness = Aliveness.Alive) { override fun scheduleShutdown(graceful: Boolean): CompileService.CallResult<Boolean> = ifAlive(minAliveness = Aliveness.LastSession, ignoreCompilerChanged = true) {
when { when {
!graceful -> { !graceful -> {
shutdownWithDelay() shutdownWithDelay()