From 3235d6d22450a8841b79bf9a7d7622e736079d05 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Mon, 17 Jul 2023 17:04:04 +0200 Subject: [PATCH] Fix NullPointerException (#15259) Fixes #15256 Signed-off-by: Jacob Laursen --- .../internal/service/MainTVServerService.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MainTVServerService.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MainTVServerService.java index 066b8f140..395769783 100644 --- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MainTVServerService.java +++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/MainTVServerService.java @@ -229,23 +229,25 @@ public class MainTVServerService implements UpnpIOParticipant, SamsungTvService String source = command.toString(); String id = null; - if (result.get("Result").equals("OK")) { + String resultResult = result.get("Result"); + if ("OK".equals(resultResult)) { String xml = result.get("SourceList"); if (xml != null) { id = parseSourceList(xml).get(source); } } else { - logger.warn("Source list query failed, result='{}'", result.get("Result")); + logger.warn("Source list query failed, result='{}'", resultResult); } if (source != null && id != null) { result = updateResourceState("MainTVAgent2", "SetMainTVSource", SamsungTvUtils.buildHashMap("Source", source, "ID", id, "UiID", "0")); - if (result.get("Result").equals("OK")) { + resultResult = result.get("Result"); + if ("OK".equals(resultResult)) { logger.debug("Command successfully executed"); } else { - logger.warn("Command execution failed, result='{}'", result.get("Result")); + logger.warn("Command execution failed, result='{}'", resultResult); } } else { logger.warn("Source id for '{}' couldn't be found", command.toString()); @@ -256,20 +258,22 @@ public class MainTVServerService implements UpnpIOParticipant, SamsungTvService Map result = updateResourceState("MainTVAgent2", "RunBrowser", SamsungTvUtils.buildHashMap("BrowserURL", command.toString())); - if (result.get("Result").equals("OK")) { + String resultResult = result.get("Result"); + if ("OK".equals(resultResult)) { logger.debug("Command successfully executed"); } else { - logger.warn("Command execution failed, result='{}'", result.get("Result")); + logger.warn("Command execution failed, result='{}'", resultResult); } } private void stopBrowser(Command command) { Map result = updateResourceState("MainTVAgent2", "StopBrowser", null); - if (result.get("Result").equals("OK")) { + String resultResult = result.get("Result"); + if ("OK".equals(resultResult)) { logger.debug("Command successfully executed"); } else { - logger.warn("Command execution failed, result='{}'", result.get("Result")); + logger.warn("Command execution failed, result='{}'", resultResult); } }