From 35f6de9c50f072aa39b4ee2b66a2136378d867e5 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Tue, 25 Apr 2017 10:41:32 +0100 Subject: [PATCH] Ignore any unsubscribe exception when closing DemoBench tab. (#579) E.g. the node may already have exited and closed the RPC session. --- .../kotlin/net/corda/demobench/views/NodeTerminalView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt index decd35c5fd..2f25b561dc 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt @@ -211,7 +211,10 @@ class NodeTerminalView : Fragment() { fun destroy() { if (!isDestroyed) { - subscriptions.forEach { it.unsubscribe() } + subscriptions.forEach { + // Don't allow any exceptions here to halt tab destruction. + try { it.unsubscribe() } catch (e: Exception) {} + } webServer.close() explorer.close() viewer.close()