From ee47b0412207348878a1e34fee96ea61fd432da8 Mon Sep 17 00:00:00 2001 From: bmalinowsky Date: Sun, 31 Mar 2024 04:44:00 +0200 Subject: [PATCH] Close after an RTE --- src/io/calimero/link/KNXNetworkLinkUsb.java | 4 ++-- src/io/calimero/link/KNXNetworkMonitorUsb.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/io/calimero/link/KNXNetworkLinkUsb.java b/src/io/calimero/link/KNXNetworkLinkUsb.java index 572a81d3..0b823726 100644 --- a/src/io/calimero/link/KNXNetworkLinkUsb.java +++ b/src/io/calimero/link/KNXNetworkLinkUsb.java @@ -159,7 +159,7 @@ void connectionStatus(final ConnectionStatus status) { linkLayerMode(); } - catch (final KNXException e) { + catch (KNXException | RuntimeException e) { notifier.quit(); conn.close(); throw e; @@ -175,7 +175,7 @@ void connectionStatus(final ConnectionStatus status) { } @Override - public void addLinkListener(NetworkLinkListener l) { + public void addLinkListener(final NetworkLinkListener l) { super.addLinkListener(l); // make sure a new listener (which is probably the main link listener) gets an immediate notification // if the usb knx connection is currently disrupted diff --git a/src/io/calimero/link/KNXNetworkMonitorUsb.java b/src/io/calimero/link/KNXNetworkMonitorUsb.java index 87b45999..14bd1a65 100644 --- a/src/io/calimero/link/KNXNetworkMonitorUsb.java +++ b/src/io/calimero/link/KNXNetworkMonitorUsb.java @@ -152,7 +152,7 @@ void connectionStatus(final ConnectionStatus status) { // init offline variable to current knx connection status conn.isKnxConnectionActive(); } - catch (final KNXException e) { + catch (KNXException | RuntimeException e) { close(); throw e; }