fixup! KTOR-8105 Fix for concurrent flush attempts breaking CIO clien…

…t (again)
ktorio · Feb 13, 2025 · 316806c · 316806c
1 parent e4f9fdf
commit 316806c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientHandshake.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientHandshake.kt
@@ -28,7 +28,7 @@ internal class TLSClientHandshake(
     rawOutput: ByteWriteChannel,
     private val config: TLSConfig,
     override val coroutineContext: CoroutineContext,
-    private val closeDeferred: CompletableDeferred<Unit> = CompletableDeferred<Unit>(),
+    private val closeTask: CompletableJob = Job(),
 ) : CoroutineScope {
     private val digest = Digest()
     private val clientSeed: ByteArray = config.random.generateClientSeed()
@@ -129,15 +129,15 @@ internal class TLSClientHandshake(
                 val record = if (useCipher) cipher.encrypt(closeRecord) else closeRecord
                 rawOutput.writeRecord(record)
                 rawOutput.flushAndClose()
-                closeDeferred.complete(Unit)
+                closeTask.complete()
             }
         }
     }
 
-    fun close(): Deferred<Unit> {
+    fun close(): Job {
         input.cancel()
         output.close()
-        return closeDeferred
+        return closeTask
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)

diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientSessionJvm.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientSessionJvm.kt
@@ -9,10 +9,12 @@ import io.ktor.network.util.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.core.*
 import io.ktor.utils.io.pool.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.*
-import java.nio.*
-import kotlin.coroutines.*
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.ClosedSendChannelException
+import kotlinx.coroutines.channels.consumeEach
+import java.nio.ByteBuffer
+import kotlin.coroutines.CoroutineContext
 
 internal actual suspend fun openTLSSession(
     socket: Socket,
@@ -26,11 +28,11 @@ internal actual suspend fun openTLSSession(
         handshake.negotiate()
     } catch (cause: Exception) {
         runCatching {
-            handshake.close().await()
+            handshake.close().join()
             socket.close()
         }
         if (cause is ClosedSendChannelException) {
-            throw TlsException("Negotiation failed due to EOS", cause)
+            throw TLSException("Negotiation failed due to EOS", cause)
         } else {
             throw cause
         }
@@ -68,7 +70,7 @@ private class TLSSocket(
                         pipe.writePacket(record.packet)
                         pipe.flush()
                     }
-                    else -> throw TlsException("Unexpected record ${record.type} ($length bytes)")
+                    else -> throw TLSException("Unexpected record ${record.type} ($length bytes)")
                 }
             }
         } catch (_: Throwable) {