demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[somfytahoma] Avoid potentiel NPE (#10453)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2021-04-04 17:34:25 +02:00 committed by GitHub
parent c738b212ec
commit c1258d78ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
View File

@ -229,7 +229,10 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
SomfyTahomaLoginResponse data = gson.fromJson(response.getContentAsString(),
SomfyTahomaLoginResponse.class);
if (data.isSuccess()) {
if (data == null) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Received invalid data (login)");
} else if (data.isSuccess()) {
logger.debug("SomfyTahoma version: {}", data.getVersion());
String id = registerEvents();
if (id != null && !id.equals(UNAUTHORIZED)) {
@ -247,11 +250,11 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
}
}
} catch (JsonSyntaxException e) {
logger.debug("Received invalid data", e);
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Received invalid data");
logger.debug("Received invalid data (login)", e);
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Received invalid data (login)");
} catch (InterruptedException | ExecutionException | TimeoutException e) {
if (e instanceof ExecutionException) {
if (e.getMessage().contains(AUTHENTICATION_CHALLENGE)) {
if (isAuthenticationChallenge(e)) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Authentication challenge");
setTooManyRequests();
@ -377,9 +380,11 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
public synchronized @Nullable SomfyTahomaDevice getCachedDevice(String url) {
List<SomfyTahomaDevice> devices = cachedDevices.getValue();
for (SomfyTahomaDevice device : devices) {
if (url.equals(device.getDeviceURL())) {
return device;
if (devices != null) {
for (SomfyTahomaDevice device : devices) {
if (url.equals(device.getDeviceURL())) {
return device;
}
}
}
return null;
@ -451,15 +456,32 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
}
private void processExecutionRegisteredEvent(SomfyTahomaEvent event) {
JsonElement el = event.getAction();
if (el.isJsonArray()) {
SomfyTahomaAction[] actions = gson.fromJson(el, SomfyTahomaAction[].class);
for (SomfyTahomaAction action : actions) {
registerExecution(action.getDeviceURL(), event.getExecId());
boolean invalidData = false;
try {
JsonElement el = event.getAction();
if (el.isJsonArray()) {
SomfyTahomaAction[] actions = gson.fromJson(el, SomfyTahomaAction[].class);
if (actions == null) {
invalidData = true;
} else {
for (SomfyTahomaAction action : actions) {
registerExecution(action.getDeviceURL(), event.getExecId());
}
}
} else {
SomfyTahomaAction action = gson.fromJson(el, SomfyTahomaAction.class);
if (action == null) {
invalidData = true;
} else {
registerExecution(action.getDeviceURL(), event.getExecId());
}
}
} else {
SomfyTahomaAction action = gson.fromJson(el, SomfyTahomaAction.class);
registerExecution(action.getDeviceURL(), event.getExecId());
} catch (JsonSyntaxException e) {
invalidData = true;
}
if (invalidData) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Received invalid data (execution registered)");
}
}
@ -771,7 +793,8 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
}
private boolean isAuthenticationChallenge(Exception ex) {
return ex.getMessage().contains(AUTHENTICATION_CHALLENGE);
String msg = ex.getMessage();
return msg != null && msg.contains(AUTHENTICATION_CHALLENGE);
}
@Override