]> git.basschouten.com Git - openhab-addons.git/commitdiff
[samsungtv] fix NPE (#8991)
authorJ-N-K <J-N-K@users.noreply.github.com>
Tue, 10 Nov 2020 07:41:04 +0000 (08:41 +0100)
committerGitHub <noreply@github.com>
Tue, 10 Nov 2020 07:41:04 +0000 (23:41 -0800)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/WakeOnLanUtility.java

index 2a7e563f6dca52949fb80a4f9e550f2c113f6b85..4d1c0c8518c04c55b2734e438c92153409d60f99 100644 (file)
@@ -77,18 +77,19 @@ public class WakeOnLanUtility {
 
         String[] cmds = Stream.of(COMMAND.split(" ")).map(arg -> String.format(arg, hostName)).toArray(String[]::new);
         String response = ExecUtil.executeCommandLineAndWaitResponse(Duration.ofMillis(CMD_TIMEOUT_MS), cmds);
-        Matcher matcher = MAC_REGEX.matcher(response);
         String macAddress = null;
 
-        while (matcher.find()) {
-            String group = matcher.group();
+        if (response != null) {
+            Matcher matcher = MAC_REGEX.matcher(response);
+            while (matcher.find()) {
+                String group = matcher.group();
 
-            if (group.length() == 17) {
-                macAddress = group;
-                break;
+                if (group.length() == 17) {
+                    macAddress = group;
+                    break;
+                }
             }
         }
-
         if (macAddress != null) {
             LOGGER.debug("MAC address of host {} is {}", hostName, macAddress);
         } else {