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

Fix too strict validation of ExtendedDeviceState number of bytes. (#11417)

Browse Source 
Fixes #11416

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
jlaur 2021-10-21 21:54:40 +02:00 committed by GitHub
parent 48fd525dea
commit b893b07329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishWasherHandler.java
View File

@ -46,7 +46,7 @@ public class DishWasherHandler extends MieleApplianceHandler<DishwasherChannelSe
private static final int POWER_CONSUMPTION_BYTE_POSITION = 16;
private static final int WATER_CONSUMPTION_BYTE_POSITION = 18;
private static final int EXTENDED_STATE_SIZE_BYTES = 24;
private static final int EXTENDED_STATE_MIN_SIZE_BYTES = 19;
private final Logger logger = LoggerFactory.getLogger(DishWasherHandler.class);
@ -97,8 +97,8 @@ public class DishWasherHandler extends MieleApplianceHandler<DishwasherChannelSe
}
public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
if (extendedDeviceState.length != EXTENDED_STATE_SIZE_BYTES) {
logger.error("Unexpected size of extended state: {}", extendedDeviceState);
if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
logger.warn("Unexpected size of extended state: {}", extendedDeviceState);
return;
}

6
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineHandler.java
View File

@ -46,7 +46,7 @@ public class WashingMachineHandler extends MieleApplianceHandler<WashingMachineC
private static final int POWER_CONSUMPTION_BYTE_POSITION = 51;
private static final int WATER_CONSUMPTION_BYTE_POSITION = 53;
private static final int EXTENDED_STATE_SIZE_BYTES = 59;
private static final int EXTENDED_STATE_MIN_SIZE_BYTES = 54;
private final Logger logger = LoggerFactory.getLogger(WashingMachineHandler.class);
@ -98,8 +98,8 @@ public class WashingMachineHandler extends MieleApplianceHandler<WashingMachineC
}
public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
if (extendedDeviceState.length != EXTENDED_STATE_SIZE_BYTES) {
logger.error("Unexpected size of extended state: {}", extendedDeviceState);
if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
logger.warn("Unexpected size of extended state: {}", extendedDeviceState);
return;
}