From 311d6389858d396c98c0313daada9c4253b70591 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Sun, 22 Dec 2024 19:11:11 +0100
Subject: [PATCH] Fix the difference in error handling between Kotlin and
 Typescript implementations in onClose

Makes the error handling behavior consistent between Kotlin and TypeScript
implementations when handling connection closure events.
---
 .../modelcontextprotocol/kotlin/sdk/shared/Protocol.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt b/src/main/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt
index 911864c2..291b2534 100644
--- a/src/main/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt
+++ b/src/main/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt
@@ -191,15 +191,15 @@ public abstract class Protocol<SendRequestT : Request, SendNotificationT : Notif
     }
 
     private fun onClose() {
-        val error = McpError(ErrorCode.Defined.ConnectionClosed.code, "Connection closed")
-        for (handler in responseHandlers.values) {
-            handler(null, error)
-        }
-
         responseHandlers.clear()
         progressHandlers.clear()
         transport = null
         onclose()
+
+        val error = McpError(ErrorCode.Defined.ConnectionClosed.code, "Connection closed")
+        for (handler in responseHandlers.values) {
+            handler(null, error)
+        }
     }
 
     private fun onError(error: Throwable) {