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

…t (again)
ktorio · Feb 14, 2025 · 37f17f5 · 37f17f5
1 parent 89c85e0
commit 37f17f5
Showing 1 changed file with 15 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
@@ -114,22 +114,26 @@ internal class TLSClientHandshake(
                 rawOutput.writeRecord(record)
             } catch (cause: Throwable) {
                 channel.close(cause)
+                break
             }
         }
     }.apply {
         invokeOnClose {
             launch(CoroutineName("cio-tls-closer")) {
-                val closeRecord = TLSRecord(
-                    TLSRecordType.Alert,
-                    packet = buildPacket {
-                        writeByte(TLSAlertLevel.WARNING.code.toByte())
-                        writeByte(TLSAlertType.CloseNotify.code.toByte())
-                    }
-                )
-                val record = if (useCipher) cipher.encrypt(closeRecord) else closeRecord
-                rawOutput.writeRecord(record)
-                rawOutput.flushAndClose()
-                closeTask.complete()
+                try {
+                    val closeRecord = TLSRecord(
+                        TLSRecordType.Alert,
+                        packet = buildPacket {
+                            writeByte(TLSAlertLevel.WARNING.code.toByte())
+                            writeByte(TLSAlertType.CloseNotify.code.toByte())
+                        }
+                    )
+                    val record = if (useCipher) cipher.encrypt(closeRecord) else closeRecord
+                    rawOutput.writeRecord(record)
+                    rawOutput.flushAndClose()
+                } finally {
+                    closeTask.complete()
+                }
             }
         }
     }