KTOR-7299 Fix close race condition causing descriptor to be closed wh…

…ile select is still busy
ktorio · Jan 31, 2025 · 9b23adc · 9b23adc
1 parent 55106bc
commit 9b23adc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ktor-network/nix/src/io/ktor/network/selector/SelectUtilsNix.kt b/ktor-network/nix/src/io/ktor/network/selector/SelectUtilsNix.kt
@@ -62,11 +62,11 @@ internal actual class SelectorHelper {
 
     actual fun requestTermination() {
         interestQueue.close()
-        closeQueue.close()
         wakeupSignal.signal()
     }
 
     private fun cleanup() {
+        closeQueue.close()
         while (true) {
             val event = closeQueue.removeFirstOrNull() ?: break
             closeDescriptor(event)

diff --git a/ktor-network/windows/src/io/ktor/network/selector/SelectUtilsWindows.kt b/ktor-network/windows/src/io/ktor/network/selector/SelectUtilsWindows.kt
@@ -43,11 +43,11 @@ internal actual class SelectorHelper {
 
     actual fun requestTermination() {
         interestQueue.close()
-        closeQueue.close()
         wakeupSignal.signal()
     }
 
     private fun cleanup() {
+        closeQueue.close()
         while (true) {
             val event = closeQueue.removeFirstOrNull() ?: break
             closeDescriptor(event)