From a88b82d8ff294766a51a976e6c5bb12d551d58eb Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 10 Feb 2021 12:08:02 +0300
Subject: [PATCH] Rewrite nasty code with if without else in elvis RHS

---
 .../common/experimental/CompileServiceClientSideImpl.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/CompileServiceClientSideImpl.kt b/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/CompileServiceClientSideImpl.kt
index f12cd9d279d..316939c04f9 100644
--- a/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/CompileServiceClientSideImpl.kt
+++ b/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/CompileServiceClientSideImpl.kt
@@ -56,10 +56,12 @@ class CompileServiceClientSideImpl(
                     while (keepAliveSuccess()) {
                         delay(KEEPALIVE_PERIOD - millisecondsSinceLastUsed())
                     }
-                    runWithTimeout(timeout = KEEPALIVE_PERIOD / 2) {
+                    val keepAliveAcknowledgement = runWithTimeout(timeout = KEEPALIVE_PERIOD / 2) {
                         val id = sendMessage(keepAliveMessage)
                         readMessage<Server.KeepAliveAcknowledgement<*>>(id)
-                    } ?: if (!keepAliveSuccess()) readActor.send(StopAllRequests()).also {
+                    }
+                    if (keepAliveAcknowledgement == null && !keepAliveSuccess()) {
+                        readActor.send(StopAllRequests())
                     }
                 }
             }