commit e37ab3dfda49cebc66a89df46df55fb1706a25fe
author Andrey Uskov <andrey.uskov@jetbrains.com> Tue Dec 21 21:20:35 2021 +0300
committer teamcity <teamcity@buildserver-linux-node-2.spc.labs.intellij.net> Mon Jan 10 11:29:26 2022 +0300
tree 25548fc35f485403274206199ebc630647e2c8f9
parent 76b7cb319363928a76aae53e1512702fa57e6e9e

Fix calculation of Kotlin Daemon alive timeout

#KT-48779 Fixed

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt

diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index e0c0611..e94b4cb 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -801,18 +801,21 @@
         compilationOptions: CompilationOptions,
         servicesFacade: CompilerServicesFacadeBase,
         compilationResults: CompilationResults?
-    ) = compileImpl(
-        sessionId,
-        compilerArguments,
-        compilationOptions,
-        servicesFacade,
-        compilationResults,
-        hasIncrementalCaches = JpsCompilerServicesFacade::hasIncrementalCaches,
-        createMessageCollector = ::CompileServicesFacadeMessageCollector,
-        createReporter = ::DaemonMessageReporter,
-        createServices = this::createCompileServices,
-        getICReporter = { a, b, c -> getBuildReporter(a, b!!, c)}
-    )
+    ) = ifAlive {
+        compileImpl(
+            sessionId,
+            compilerArguments,
+            compilationOptions,
+            servicesFacade,
+            compilationResults,
+            hasIncrementalCaches = JpsCompilerServicesFacade::hasIncrementalCaches,
+            createMessageCollector = ::CompileServicesFacadeMessageCollector,
+            createReporter = ::DaemonMessageReporter,
+            createServices = this::createCompileServices,
+            getICReporter = { a, b, c -> getBuildReporter(a, b!!, c)}
+        )
+    }
+
 
     @Deprecated("The usages should be replaced with other `leaseReplSession` method", ReplaceWith("leaseReplSession"))
     override fun leaseReplSession(