From 82fb4c4151de203d3d06cb13978ee23b3950c416 Mon Sep 17 00:00:00 2001 From: Robinson Date: Mon, 4 Apr 2022 23:04:42 +0200 Subject: [PATCH] Cleaned up exceptions --- .../network/aeron/IpcMediaDriverConnection.kt | 15 ++++++++++----- .../aeron/UdpMediaDriverClientConnection.kt | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt b/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt index efa1eb3c..620a6a20 100644 --- a/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt +++ b/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt @@ -16,11 +16,11 @@ package dorkbox.network.aeron +import dorkbox.network.connection.ListenerManager import dorkbox.network.exceptions.ClientTimedOutException import io.aeron.ChannelUriStringBuilder import kotlinx.coroutines.delay import mu.KLogger -import java.lang.Thread.sleep import java.util.concurrent.* /** @@ -81,13 +81,15 @@ internal open class IpcMediaDriverConnection(streamId: Int, break } - delay(500L) // not delay? maybe coroutines? + delay(500L) } if (!success) { subscription.close() - throw ClientTimedOutException("Creating subscription connection to aeron") + val clientTimedOutException = ClientTimedOutException("Creating subscription connection to aeron") + ListenerManager.cleanStackTraceInternal(clientTimedOutException) + throw clientTimedOutException } @@ -101,13 +103,16 @@ internal open class IpcMediaDriverConnection(streamId: Int, break } - delay(500L) // not delay? maybe coroutines? + delay(500L) } if (!success) { subscription.close() publication.close() - throw ClientTimedOutException("Creating publication connection to aeron") + + val clientTimedOutException = ClientTimedOutException("Creating publication connection to aeron") + ListenerManager.cleanStackTraceInternal(clientTimedOutException) + throw clientTimedOutException } this.success = true diff --git a/src/dorkbox/network/aeron/UdpMediaDriverClientConnection.kt b/src/dorkbox/network/aeron/UdpMediaDriverClientConnection.kt index 8edea9e2..aed63d6c 100644 --- a/src/dorkbox/network/aeron/UdpMediaDriverClientConnection.kt +++ b/src/dorkbox/network/aeron/UdpMediaDriverClientConnection.kt @@ -124,7 +124,7 @@ internal class UdpMediaDriverClientConnection(val address: InetAddress, if (!success) { subscription.close() val ex = ClientTimedOutException("Cannot create subscription: $ip ${subscriptionUri.build()} in ${timoutInNanos}ms") - ListenerManager.cleanStackTrace(ex) + ListenerManager.cleanStackTraceInternal(ex) throw ex }