From 58ab5623227ff3bc34f77351f76e35128dd20689 Mon Sep 17 00:00:00 2001
From: Karlatemp <kar@kasukusakura.com>
Date: Thu, 20 Oct 2022 12:56:39 +0800
Subject: [PATCH] [core - JVM] [Network] Wrap exception from connecting to
`NettyChannelException` to allow selector to reconnect
---
.../kotlin/network/impl/netty/NettyNetworkHandler.kt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
index d2e3edce1..04909eb0f 100644
--- a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
+++ b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
@@ -9,7 +9,6 @@
package net.mamoe.mirai.internal.network.impl.netty
-import io.ktor.utils.io.core.*
import io.netty.bootstrap.Bootstrap
import io.netty.buffer.ByteBuf
import io.netty.channel.*
@@ -113,7 +112,9 @@ internal open class NettyNetworkHandler(
}.onFailure {
eventLoopGroup.shutdownGracefully()
contextResult.cancel()
- }.getOrThrow()
+ }.getOrElse { error ->
+ throw NettyChannelException(cause = error)
+ }
contextResult.complete(future.channel())