Catch number format exception in scene converter

Signed-off-by: Chris Jackson <chris@cd-jackson.com>
openhab · Mar 18, 2016 · 0acee35 · 0acee35
1 parent ba61951
commit 0acee35
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveSceneConverter.java b/...zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveSceneConverter.java
@@ -69,17 +69,28 @@ SerialMessage executeRefresh(ZWaveNode node, ZWaveSceneActivationCommandClass co
 
     @Override
     void handleEvent(ZWaveCommandClassValueEvent event, Item item, Map<String, String> arguments) {
-        if (arguments.get("scene") == null) {
+        if (arguments.get("scene") == null || arguments.get("state") == null) {
+            logger.warn("NODE {}: Scene arguments not set scene={} state={}", event.getNodeId(), arguments.get("scene"),
+                    arguments.get("state"));
+            return;
+        }
+
+        Integer scene = null;
+        Integer state = null;
+        try {
+            scene = Integer.parseInt(arguments.get("scene"));
+            state = Integer.parseInt(arguments.get("state"));
+        } catch (NumberFormatException e) {
+            logger.error("NODE {}: Number format exception {} {}", event.getNodeId(), arguments.get("scene"),
+                    arguments.get("state"));
             return;
         }
 
-        int scene = Integer.parseInt(arguments.get("scene"));
         if (scene != (Integer) event.getValue()) {
             return;
         }
-        Integer state = Integer.parseInt(arguments.get("state"));
-        ZWaveStateConverter<?, ?> converter = this.getStateConverter(item, state);
 
+        ZWaveStateConverter<?, ?> converter = this.getStateConverter(item, state);
         if (converter == null) {
             logger.warn("No converter found for item = {}, node = {} endpoint = {}, ignoring event.", item.getName(),
                     event.getNodeId(), event.getEndpoint());