Fix Socket Close

naotiki · May 24, 2023 · 20c2648 · 20c2648
1 parent 7f8d7e5
commit 20c2648
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/client-app/src/main/kotlin/server/Server.kt b/client-app/src/main/kotlin/server/Server.kt
@@ -9,16 +9,23 @@ import kotlinx.serialization.decodeFromByteArray
 import java.io.DataInputStream
 import java.net.ServerSocket
 import java.net.Socket
+import java.net.SocketException
 import java.nio.ByteBuffer
 class Server(val port: Int=PORT) {
     val serverSocket = ServerSocket(port)
 
     suspend fun runServer()= withContext(Dispatchers.IO){
         suspendCancellableCoroutine<Unit> {
             it.invokeOnCancellation { serverSocket.close() }
-            while (it.isActive){
-                val socket=serverSocket.accept()
-                ServerThread(socket).start()
+            runCatching {
+                while (it.isActive){
+                    val socket=serverSocket.accept()
+                    ServerThread(socket).start()
+                }
+            }.onFailure { throwable ->
+                if (throwable is SocketException){
+                    throwable.printStackTrace()
+                }else throw throwable
             }
             println("Server Shutdown")
         }