Fixed #303

home-climate-control · Dec 27, 2023 · f595dcc · f595dcc
1 parent aaea3d4
commit f595dcc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v1/Z2MJsonListener.java b/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v1/Z2MJsonListener.java
@@ -104,8 +104,13 @@ private Signal<Double, Void> convert(Signal<String, Void> signal) {
 
             return new Signal<>(signal.timestamp, value);
 
-        } catch (JsonProcessingException e) {
-            throw new IllegalStateException("Can't parse JSON: " + signal.getValue(), e);
+        } catch (JsonProcessingException ex) {
+
+            // Throwing an exception here breaks everything
+            // https://github.com/home-climate-control/dz/issues/303
+
+            logger.error("Can't parse JSON:\n{}\n---", signal.getValue(), ex);
+            return new Signal<>(signal.timestamp, null, signal.payload, Signal.Status.FAILURE_TOTAL, ex);
         }
     }
 }
diff --git a/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v2/Z2MCqrsSwitch.java b/dz3r-mqtt/src/main/java/net/sf/dz3r/device/z2m/v2/Z2MCqrsSwitch.java
@@ -55,8 +55,12 @@ protected void parseState(MqttSignal message) {
 
             stateSink.tryEmitNext(getStateSignal());
 
-        } catch (JsonProcessingException e) {
-            throw new IllegalStateException("Can't parse JSON: " + message, e);
+        } catch (JsonProcessingException ex) {
+
+            // Throwing an exception here breaks everything
+            // https://github.com/home-climate-control/dz/issues/303
+
+            logger.error("Can't parse JSON:\n{}\n---", message, ex);
         } finally {
             ThreadContext.pop();
         }

diff --git a/dz3r-mqtt/src/main/java/net/sf/dz3r/device/zwave/v2/ZWaveCqrsBinarySwitch.java b/dz3r-mqtt/src/main/java/net/sf/dz3r/device/zwave/v2/ZWaveCqrsBinarySwitch.java
@@ -39,10 +39,15 @@ protected void parseState(MqttSignal message) {
 
             actual = Boolean.valueOf(payload.get("value").toString());
 
-        } catch (JsonProcessingException e) {
+        } catch (JsonProcessingException ex) {
 
             actual = null;
-            throw new IllegalStateException("Can't parse JSON: " + message, e);
+
+            // Throwing an exception here breaks everything
+            // https://github.com/home-climate-control/dz/issues/303
+
+            logger.error("Can't parse JSON:\n{}\n---", message, ex);
+
 
         } finally {
             ThreadContext.pop();