From 487d9654410435cce77598d9fb0c03c2cf70c5df Mon Sep 17 00:00:00 2001 From: kpanchen <43836896+kpanchen@users.noreply.github.com> Date: Thu, 14 Feb 2019 02:23:58 -0500 Subject: [PATCH] Update NetworkUtils.java (#4900) Removed "(\s*)" from RegExp expression as "\s" not present in the current tool help output and it will fail RegExp, current tool output looks like this (as of version 2.19): -w sec Specify a timeout before ping exits regardless of how many packets have been sent or received. Signed-off-by: Konstantin Panchenko Signed-off-by: Pshatsillo --- .../openhab/binding/network/internal/utils/NetworkUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6028b1910d1ab..bee510d0ab673 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 @@ -200,7 +200,7 @@ public ArpPingUtilEnum determineNativeARPpingMethod(String arpToolPath) { if (StringUtils.isBlank(result)) { return ArpPingUtilEnum.UNKNOWN_TOOL; } else if (result.contains("Thomas Habets")) { - if (result.matches("(?s)(.*)w sec(\\s*)Specify a timeout(.*)")) { + if (result.matches("(?s)(.*)w sec Specify a timeout(.*)")) { return ArpPingUtilEnum.THOMAS_HABERT_ARPING; } else { return ArpPingUtilEnum.THOMAS_HABERT_ARPING_WITHOUT_TIMEOUT;