Avoid NPE while handling INCREASE/DECREASE commands (#3895)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
eclipse-archived · Jul 26, 2017 · 9a01200 · 9a01200
1 parent 5c4a676
commit 9a01200
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...dfri/src/main/java/org/eclipse/smarthome/binding/tradfri/handler/TradfriLightHandler.java b/...dfri/src/main/java/org/eclipse/smarthome/binding/tradfri/handler/TradfriLightHandler.java
@@ -181,7 +181,7 @@ private void handleBrightnessCommand(Command command) {
         } else if (command instanceof OnOffType) {
             setState(((OnOffType) command));
         } else if (command instanceof IncreaseDecreaseType) {
-            if (state != null) {
+            if (state != null && state.getBrightness() != null) {
                 int current = state.getBrightness().intValue();
                 if (IncreaseDecreaseType.INCREASE.equals(command)) {
                     setBrightness(new PercentType(Math.min(current + STEP, PercentType.HUNDRED.intValue())));
@@ -200,7 +200,7 @@ private void handleColorTemperatureCommand(Command command) {
         if (command instanceof PercentType) {
             setColorTemperature((PercentType) command);
         } else if (command instanceof IncreaseDecreaseType) {
-            if (state != null) {
+            if (state != null && state.getColorTemperature() != null) {
                 int current = state.getColorTemperature().intValue();
                 if (IncreaseDecreaseType.INCREASE.equals(command)) {
                     setColorTemperature(new PercentType(Math.min(current + STEP, PercentType.HUNDRED.intValue())));