From 99358b77898f714e2b3b5774d04cd30b2ab76f26 Mon Sep 17 00:00:00 2001 From: John Sichi Date: Fri, 20 Apr 2018 23:47:57 -0700 Subject: [PATCH] [network] Interpret ConnectException as service absent rather than present. (#3501) * Interpret ConnectException as service absent rather than service present. * Use multicatch for servicePing exception handling. Signed-off-by: John Sichi (github: jsichi) --- .../binding/network/internal/utils/NetworkUtils.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/binding/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/utils/NetworkUtils.java b/addons/binding/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/utils/NetworkUtils.java index 304f1a3074..fa4a1aec1f 100644 --- a/addons/binding/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/utils/NetworkUtils.java +++ b/addons/binding/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/utils/NetworkUtils.java @@ -159,13 +159,8 @@ public boolean servicePing(String host, int port, int timeout) throws IOExceptio try (Socket socket = new Socket()) { socket.connect(socketAddress, timeout); return true; - } catch (NoRouteToHostException ignored) { + } catch (ConnectException | SocketTimeoutException | NoRouteToHostException ignored) { return false; - } catch (SocketTimeoutException ignored) { - return false; - } catch (ConnectException e) { - // Connection refused, there is a device on the other end though - return true; } }