From e37ab3dfda49cebc66a89df46df55fb1706a25fe Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 21 Dec 2021 21:20:35 +0300 Subject: [PATCH] Fix calculation of Kotlin Daemon alive timeout #KT-48779 Fixed --- .../kotlin/daemon/CompileServiceImpl.kt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index e0c06112940..e94b4cbf3aa 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 @@ class CompileServiceImpl( 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(