From 5b4e99c52df42813a1de6feca755830c5cc3ce96 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 14 Feb 2020 20:13:40 +0800 Subject: [PATCH] Override close explicitly --- .../kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt | 2 +- .../kotlin/net.mamoe.mirai/utils/io/PlatformSocket.kt | 3 ++- .../jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt index 1401f70fb..f20543980 100644 --- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt +++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt @@ -32,7 +32,7 @@ actual class PlatformSocket : Closeable { actual val isOpen: Boolean get() = socket.isConnected - override fun close() = socket.close() + actual override fun close() = socket.close() @PublishedApi internal lateinit var writeChannel: BufferedOutputStream diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/PlatformSocket.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/PlatformSocket.kt index 6b71d2885..70b411fae 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/PlatformSocket.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/PlatformSocket.kt @@ -11,7 +11,6 @@ package net.mamoe.mirai.utils.io import kotlinx.io.core.ByteReadPacket import kotlinx.io.core.Closeable -import kotlinx.io.errors.IOException import net.mamoe.mirai.utils.MiraiInternalAPI /** @@ -37,4 +36,6 @@ expect class PlatformSocket() : Closeable { suspend fun read(): ByteReadPacket val isOpen: Boolean + + override fun close() } \ No newline at end of file diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt index 33aa5c19e..07f22e1e3 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt @@ -32,7 +32,7 @@ actual class PlatformSocket : Closeable { actual val isOpen: Boolean get() = socket.isConnected - override fun close() { + actual override fun close() { if (::socket.isInitialized) { socket.close() }