🐛 修复了socket关闭时机错误导致的崩溃问题

RedrockMobile · Mar 9, 2023 · 8769c07 · 8769c07
1 parent 11a0df9
commit 8769c07
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sso/src/main/java/com/redrock/sso/Server.kt b/sso/src/main/java/com/redrock/sso/Server.kt
@@ -21,13 +21,15 @@ internal object Server {
         continuation.invokeOnCancellation {
           serverSocket.close()
         }
+        var socket : Socket? = null
         try {
-          val socket = serverSocket.accept()
-          socket.close()
-          serverSocket.close()
+          socket = serverSocket.accept()
           continuation.resumeWith(Result.success(getData(socket)))
         } catch (_: SocketException) {
           // socket 被 serverSocket cancel 时抛出的异常
+        } finally {
+          socket?.close()
+          serverSocket.close()
         }
       }
     }