From 659002f5ce68bba7ec48718cff1ff6da15b68e53 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 5 Apr 2017 10:07:22 +0200
Subject: [PATCH] minor: Fix daemon shutdown livelock

due to wrong minimal aliveness, daemon was in some situations livelocked
in the last session state on shutdown.
---
 .../src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 7df11129635..3aee6a8fbe5 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -259,7 +259,7 @@ class CompileServiceImpl(
         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 {
             !graceful -> {
                 shutdownWithDelay()