Fix race in websocket close

2b56035c · Leonid Stashevsky · c2d53b39 · 2b56035c · 2b56035c · 2b56035c
--- a/ktor-features/ktor-websockets/jvm/src/io/ktor/websocket/Routing.kt
+++ b/ktor-features/ktor-websockets/jvm/src/io/ktor/websocket/Routing.kt
@@ -116,8 +116,11 @@ private fun Route.webSocketProtocol(protocol: String?, block: Route.() -> Unit)
 private suspend fun WebSocketServerSession.proceedWebSocket(handler: suspend DefaultWebSocketServerSession.() -> Unit) {
    val webSockets = application.feature(WebSockets)
-    val session =
+    val session = DefaultWebSocketSessionImpl(
-        DefaultWebSocketSessionImpl(this, webSockets.pingInterval?.toMillis() ?: -1L, webSockets.timeout.toMillis())
+        this,
+        webSockets.pingInterval?.toMillis() ?: -1L,
+        webSockets.timeout.toMillis()
+    )
    session.run {
        try {
            toServerSession(call).handler()

--- a/ktor-features/ktor-websockets/jvm/test/io/ktor/tests/websocket/WebSocketEngineSuite.kt
+++ b/ktor-features/ktor-websockets/jvm/test/io/ktor/tests/websocket/WebSocketEngineSuite.kt
@@ -245,7 +245,7 @@ abstract class WebSocketEngineSuite<TEngine : ApplicationEngine, TConfiguration
    @Test
    fun testProduceMessages() {
        val count = 125
-        val template = (1..count).map { (it and 0x0f).toString(16) }.joinToString("")
+        val template = (1..count).joinToString("") { (it and 0x0f).toString(16) }
        createAndStartServer {
            webSocket("/") {

--- a/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/websocket/DefaultWebSocketSessionImpl.kt
+++ b/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/websocket/DefaultWebSocketSessionImpl.kt
@@ -64,7 +64,7 @@ class DefaultWebSocketSessionImpl(
            else -> CloseReason(CloseReason.Codes.UNEXPECTED_CONDITION, cause.message ?: cause.javaClass.name)
        }
-        sendCloseSequence(reason)
+        reason?.let { send(Frame.Close(it)) }
    }
    @UseExperimental(ExperimentalCoroutinesApi::class, ObsoleteCoroutinesApi::class)