From 3d112b91d58aad32bf4e7ab7335daf87d7fb6543 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 14 Dec 2018 10:58:09 +0100 Subject: [PATCH] Fix bug where a properly closed connection was marked as errored --- .../de/kuschku/libquassel/connection/CoreConnection.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt b/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt index fd70f1edb..8d42465c8 100644 --- a/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt +++ b/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt @@ -229,6 +229,8 @@ class CoreConnection( } channel?.close() } catch (e: Throwable) { + val closed = state.value == ConnectionState.CLOSED + var cause: Throwable? = e var exception: QuasselSecurityException? do { @@ -239,10 +241,12 @@ class CoreConnection( close() securityExceptionCallback(exception) } else { - log(WARN, TAG, "Error encountered in connection", e) - log(WARN, TAG, "Last sent message: ${MessageRunnable.lastSent.get()}") + if (!closed) { + log(WARN, TAG, "Error encountered in connection", e) + log(WARN, TAG, "Last sent message: ${MessageRunnable.lastSent.get()}") + exceptionCallback(e) + } close() - exceptionCallback(e) } } } -- GitLab