public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional error handling (#13146) 

Signed-off-by: matchews <mmyers75@icloud.com>
This commit is contained in:
Matt 2022-07-20 10:26:15 -04:00 committed by GitHub
parent d2670e40cb
commit 848ec83d52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
View File

@ -199,6 +199,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
xmlResponse = httpXmlResponse(urlParameters); xmlResponse = httpXmlResponse(urlParameters);
if (xmlResponse.isEmpty()) { if (xmlResponse.isEmpty()) {
logger.debug("Hayward Connection thing: Login XML response was null");
return false; return false;
} }
@ -227,7 +228,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
xmlResponse = httpXmlResponse(urlParameters); xmlResponse = httpXmlResponse(urlParameters);
if (xmlResponse.isEmpty()) { if (xmlResponse.isEmpty()) {
logger.debug("Hayward Connection thing: Login XML response was null"); logger.debug("Hayward Connection thing: getApiDef XML response was null");
return false; return false;
} }
return true; return true;
@ -277,12 +278,12 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
String xmlResponse = httpXmlResponse(urlParameters); String xmlResponse = httpXmlResponse(urlParameters);
if (xmlResponse.isEmpty()) { if (xmlResponse.isEmpty()) {
logger.debug("Hayward Connection thing: requestConfig XML response was null"); logger.debug("Hayward Connection thing: getMSPConfig XML response was null");
return "Fail"; return "Fail";
} }
if (evaluateXPath("//Backyard/Name/text()", xmlResponse).isEmpty()) { if (evaluateXPath("//Backyard/Name/text()", xmlResponse).isEmpty()) {
logger.debug("Hayward Connection thing: requestConfiguration XML response: {}", xmlResponse); logger.debug("Hayward Connection thing: getMSPConfig XML response: {}", xmlResponse);
return "Fail"; return "Fail";
} }
return xmlResponse; return xmlResponse;
@ -294,6 +295,10 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
String xmlResponse = getMspConfig(); String xmlResponse = getMspConfig();
if (xmlResponse.contentEquals("Fail")) {
return false;
}
// Get Units (Standard, Metric) // Get Units (Standard, Metric)
property1 = evaluateXPath("//System/Units/text()", xmlResponse); property1 = evaluateXPath("//System/Units/text()", xmlResponse);
account.units = property1.get(0); account.units = property1.get(0);