[draytonwiser] Remove possibility of returning a null state for boost…

… duration Signed-off-by: Andrew Schofield <the.uncle.fungus@gmail.com>
openhab · Jul 14, 2020 · fe35575 · fe35575
1 parent 37ff7fe
commit fe35575
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...iser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java b/...iser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
@@ -132,7 +132,11 @@ private State getBoostRemainingState() {
  final Integer overrideTimeout = firstChannel.getOverrideTimeoutUnixTime();
 
  if (overrideTimeout != null && !"NONE".equalsIgnoreCase(firstChannel.getOverrideType())) {
- return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), SmartHomeUnits.SECOND).toUnit(SmartHomeUnits.MINUTE);
+ final QuantityType<Time> duration = new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), SmartHomeUnits.SECOND).toUnit(SmartHomeUnits.MINUTE);
+ if (duration != null)
+ {
+ return duration;
+ } 
  }
  }
  return new QuantityType<Time>(0, SmartHomeUnits.MINUTE);

diff --git a/...tonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java b/...tonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java
@@ -168,7 +168,11 @@ private State getBoostedState() {
  private State getBoostRemainingState() {
  final Integer overrideTimeout = getData().getOverrideTimeoutUnixTime();
  if (overrideTimeout != null && !"NONE".equalsIgnoreCase(getData().getOverrideType())) {
- return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), SmartHomeUnits.SECOND).toUnit(SmartHomeUnits.MINUTE);
+ final QuantityType<Time> duration = new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), SmartHomeUnits.SECOND).toUnit(SmartHomeUnits.MINUTE);
+ if (duration != null)
+ {
+ return duration;
+ } 
  }
  return new QuantityType<Time>(0, SmartHomeUnits.MINUTE);
  }